iterm2/solarized support
Merge branch 'master' of github.com:chase-seibert/chase-vimrc

Conflicts:
	.vimrc