Various changes to emacs init. Added stuff to gitignore.
Merge branch 'master' of https://github.com/asilata/.dotfiles

Conflicts:
	.gitignore_global