More changes related to emacs23
Merge branch 'master' of https://github.com/krasm/emacsrc

Conflicts:
	init.el