Putting in all the hacks that make this a hackathon. Last minute changes galore.
Merge branch 'master' of https://github.com/hopperj/EMACS

Conflicts:
	emacs/device/models.pyc