Spring cleaning
Merge branch 'master' of https://github.com/mrstocks/secret-ninja