Updated emacs to 24.4.
Updates to emacs 24.4
Merge branch 'master' of https://github.com/skywriter2000/.emacs.d

Conflicts:
	my-package-repos.el~