Merge pull request #5 from rlerdorf/master

Cleanups