save state oct 20 2014
Merge branch 'master' of github.com:johnbenjaminlewis/dotfiles

Conflicts:
	.vimrc
Changed contast, added rainbowparens