Source additional env vars
Merge branch 'master' of github.com:srhaber/dotfiles
Merge