Add some organization to my vimrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] bash/aliases