Add a ton of colors and stuff
Merge
Add tmux.conf and vimrc