Electric indent mode
Ignore unneeded stuff
Merge branch 'master' of github.com:pimeys/dotemacs

Conflicts:
	.gitignore
	elpa/archives/gnu/archive-contents
	elpa/archives/melpa/archive-contents