gitignore ++ update emacs
Merge branch 'master' of github.com:JulianNymark/configs

Conflicts:
	emacs/.emacs