Cleaned up a bunch of hg stuff.
Merge pull request #25 from agroener/master

Cleaned up a bunch of hg stuff.