bring back column position to vim settings - add scroll-clear function to bash
Merge branch 'master' of https://github.com/wbbradley/dotfiles

Conflicts:
	.bashrc