Add autosave
Merge branch 'master' of github.com:andrew-d/dotfiles

Conflicts:
	.gitmodules