Added some useful bundle exec aliases.
Use vi mode in bash, plus:

- New rmerge alias for git
- Use NERDTree, not VimFiler
added sendemail directive to git, misc bashrc changes.
Merge remote-tracking branch 'origin/master' into osx