Misc cleanup that I pulled out of other unrelated branches
Merge pull request #181 from Yelp/misc_cleanup

Misc cleanup that I pulled out of other unrelated branches