unify conventions between projects
Merge branch 'master' of github.com:jmrod4/jmrod4tools