Remove old paul.el file.
Merge branch 'emacs-update' into ubuntu

Conflicts:
	.emacs.d/paul.el