Fixing things.
Merge branch 'master' of https://github.com/aryamccarthy/FYD
House cleaining.