Fix PS1 and check for Bash 4+ for some shell options
Merge changes from origin/master