Added vim scratchpad alias and fixed switch for PS1.
Merge branch 'master' of https://github.com/melloc/dotfiles