Merge pull request #7 from ribasushi/master
Jesse Luehrs [Thu, 4 Jul 2013 14:32:25 +0000 (07:32 -0700)]
Various housekeeping etc


Trivial merge