Revert "glad i managed to fix that tonight"

This reverts commit 8d284a26a75b59c33afb8e43bce9bcd3f6bdfb67.

Conflicts:
	emacs_integration.el
	server.js