Clean-up
Merge branch 'master' of github.com:jsantaniello/misc