cleanup
Merge branch 'master' of https://github.com/neilbaylorrulez/devangelism
Merge branch 'master' of https://github.com/neilbaylorrulez/devangelism
awesome stuff
fix merge