Uncomment vim stuff
Fix whitespace/tabbing
Add tmux hooks