Don't print useless slashes in pwd prompt
Merge remote-tracking branch 'origin/master'