Updates to .emacs
Merge branch 'master' of github.com:alexras/emacsfiles

Conflicts:
	.emacs