[config-files] auto setup.sh made
[config-files] .vim commit
Merge branch 'master' of github.com:mopinfish/config-files

Conflicts:
	.vimrc