Updated colors in theme and updated vimrc
Merge branch 'master' of https://github.com/mannebusk/mannebusk-vimrc

Conflicts:
	.vimrc