Enabled 256 colors and cursorline for vim
Merge branch 'master' of https://github.com/ovu/dotfiles

Conflicts:
	.vimrc