update master from working
prep for merging into master
Merge branch 'master' of https://github.com/rebcabin/ClojureProjects