Edits to vimrc to use canonical solarized colours.
Merge branch 'master' of github.com:JCook21/vip

Conflicts:
	home/.vimrc