autosaves and backups are hidden away
Merge branch 'master' of https://github.com/zakandrewking/emacs-d

Conflicts:
	init.el