Excluded screen from 16 color mode, since Prompt doesn't work too well
Further tweaking of vim color mode
Merge branch 'master' of github.com:deiga/dotfiles
Excluded vim temp files from links