Just Some Cleanup

Awesome job! Haven't had the time to check it out, but did some cleanup while getting it set up on my machine.

![borat-high-five](https://cloud.githubusercontent.com/assets/191770/2954336/3c49d088-da70-11e3-9257-a5a36c87681b.gif)