Merge local changes.
Fix semantic and ede mode calls.
Update custom elisp and soothe theme.
Update UI file to use soothe.
Update elpa.
Merge branch 'work'

Conflicts:
	elpa/archives/gnu/archive-contents
	emacs-custom.el
	extras/nick-custom.el
	init.el