moved ps1 to master
added ps1 and removed bash/env
Merge branch 'master' into mac
deleted reference to mac config
updated ps1 and gitignore
added mate to path and mac_setup file