Merge pull request #16 from gjtorikian/get-rid-of-all-my-crap

Get rid of some crap
Merge branch 'master' into review