some changes
Merge branch 'master' of github.com:CodingFu/dotfiles-local

Conflicts:
	aliases.local
	vimrc.bundles.local
	vimrc.local
fix