fix conflict
remove solarized from color scheme
add new bundles
Merge branch 'master' of github.com:aaronjorbin/.vim
change tab indenting based on filetype
file specific styles
spelling additions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vimrc