fixed powerline issues on Linux, not sure about mac
made updating PS1 safer if powerline-shell.py is not found
fixed conflicts from air