local config out of git
Merge branch 'master' of github.com:gabeshaughnessy/Zoomtopia