Merge pull request #248 from prattmic/cleanup
authortexane <texane@gmail.com>
Thu, 10 Jul 2014 07:08:26 +0000 (02:08 -0500)
committertexane <texane@gmail.com>
Thu, 10 Jul 2014 07:08:26 +0000 (02:08 -0500)
Initial code cleanup


Trivial merge