altered PS and EDITOR
Merge branch 'master' of github.com:pfarrell/dotfiles