vimrc backspace
Merge branch 'master' of https://github.com/malcolmmoyes/dotfiles

Conflicts:
	bashrc