vimrc adjustment
Merge branch 'master' of github.com:hsiuhsiu/rc_file

Conflicts:
	.vimrc