add config files
Merge branch 'master' of github.com:bastien03/dotfiles

Conflicts:
	.vimrc