Removing .netrwhist from the repo
Merge branch 'master' of https://github.com/abates/dev-env

Conflicts:
	.vim/.netrwhist
Merge branch 'master' of https://github.com/abates/dev-env