added sourcing local vimrc files
Merge branch 'master' of https://github.com/wwenbow/dotfiles
Windows settings
Conflicts:
	.vimrc