Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/init-eyecandy.el
Merge branch 'master' of github.com:capdevc/dotemacs
removed the quit defadvice