Fix so backups/ exists in repo if not present
Add some sane vimdiff defaults. Make syntastic use locations
Merge branch 'master' of https://github.com/calebsmith/vimrc

Conflicts:
	vim/vimrc