ensured vim uses 256 colors
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from oddjobsman/master

Vim should 256 colors in terminal mode also