Added new emacs config
Merge branch 'master' of github.com:Darkade/emacs-config

Conflicts:
	emacs-desktop