cleanup
more cleanup
Merge branch 'master' of github.com:timbreitkreutz/puzzler