local mac changes - may break things
Merge branch 'master' of github.com:ifiokjr/dev-env

Changes needed to be made on the mac that may not work on ubuntu.
a mixed bag of changes