Merge pull request #26 from sethwoodworth/test
authorSeth Woodworth <seth@sethish.com>
Thu, 9 Feb 2012 07:08:36 +0000 (23:08 -0800)
committerSeth Woodworth <seth@sethish.com>
Thu, 9 Feb 2012 07:08:36 +0000 (23:08 -0800)
Merging latest test with develop branch


Trivial merge