easily add encryption instruction to mode line
remove marmelade from package sources
"F9 g" calls gnus
Merge branch 'master' of github.com:jxonas/emacstuff

Conflicts:
	emacstuff.org