Cleanup
Merge branch 'master' of github.com:/chudley/config