soln to Yosemite env bug
Merge branch 'master' of https://github.com/jrminter/tips