Merging
Merge branch 'master' of github.com:edurand/dot-files

Conflicts:
	.vim/.netrwhist
inputrc added