Fixed broken Globus stuff.
Merge branch 'master' into mac
Changed git editor to use /usr/bin/env.
Made Git PS1 stuff more robust.
Merge branch 'master' of github.com:willvousden/shell
Merge branch 'master' into mac