Now running emacs in servermode.
Fixed exports.
Bump .emacs.d pointer to get rid of python-mode.
Bump .emacs.d submodule pointer change.
Merge remote-tracking branch 'origin/master' into yelp

* origin/master:
  Bump .emacs.d submodule pointer change.
  Bump .emacs.d pointer to get rid of python-mode.
  Fixed exports.
  Now running emacs in servermode.

Conflicts:
	.emacs.d
bump .emacs and added .emacs.desktop.lock to gitignore.
ignoreing all .emacs* in git.