No more auto update checks for oh-my-zsh and updated backspace settings for vim
Merge branch 'master' of github.com:patrik-johansson/dotfiles

Conflicts:
	.zshrc