Fix vim colors (tmux set to use 256 with -2)
Merge branch 'master' of github.com:oysteinkrog/dotfiles