- Add new aliases
- Update vimrc with new remaps and file specific stuff
- Update osx file by removing stuff I don't need
Resolved merge conflicts
resolved tmux merge conflicts
Add nerdtree configuration to vimrc