More changes to make this work better between my Macbook and my Linux desktop :)
Merge branch 'master' of https://github.com/abates/dev-env