history and vim syntax fixes
Merge branch 'master' of github.com:drosile/config

Conflicts:
	.bashrc