update some config
Merge branch 'master' of https://github.com/LionelMartin/Setup

Conflicts:
	home/.vimrc.local
Merge branch 'master' of https://github.com/LionelMartin/Setup

Conflicts:
	home/.vimrc.local