Move source place of git-prompt
Set bundler open editor to sublime
Prefer [[ ]] over [ ]
Set mergetool for git