Added vim solarized
Set colors to use solarized
Merge branch 'master' of github.com:cgardner/dotfiles

Conflicts:
	.vimrc