Fixed some problems with Windows.
Fixed color for windows terminal
Merge branch 'master' of http://github.com/dariomanesku/.vim

Conflicts:
	bundle/vim256-color