Merge pull request #117 from arjunguha/master

Some trivial cleanup