committing from Racoon
Merge branch 'master' of https://github.com/jqtruong/emacs

Conflicts:
	.emacs
	.emacs.d/elpa/archives/gnu/archive-contents
	.emacs.d/elpa/archives/marmalade/archive-contents
	.emacs.d/elpa/archives/melpa/archive-contents
	.emacs.d/tramp
	.emacs.d/url/cookies