Set path via the shell.
Merge branch 'master' of github.com:afeinberg/dot
Fixed a merge conflict between stash