cleanup bashrc
Merge branch 'master' of github.com:nathanleiby/dotfiles

Conflicts:
	bashrc
minor cleanup

- README - cleanup
- bashrc
  - move NVM exports.
  - `git add` arg ordering to make `gaa` work
- vimrc - TODO: make sure it helps formatting git messages
vim - update vimrc and add molokai colors
bashrc - reorganize