add autocmd
Merge branch 'master' of http://github.com/ricky155030/configuration

Conflicts:
	.vim/vimrc