add to vimrc: better colors, filetype-specific settings, shortcuts
vimrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bashrc
	.vimrc
vimrc