changed vimrcs
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/_vimrc
some more notes for myself