fixed backspace
Merge branch 'master' of https://github.com/mwillsey/dotfiles

Conflicts:
	.vimrc