Ho ho ho
Merge branch 'master' of https://bitbucket.org/muchzill4/setup

Conflicts:
	dotfiles/.vimrc
Backtick prefix
Backspace craziness
Clear and make
Autosave