update config
Merge branch 'master' of github.com:guileen/config

Conflicts:
	vimrc
Merge branch 'master' of github.com:guileen/config