Merge changes from work
Uncommented Vundle stuff (only breaks on windows). Added set 256 colors in terminal.