Use vi mode in bash, plus:

- New rmerge alias for git
- Use NERDTree, not VimFiler