updated to elfeed, new w3m and other minor changes
last fix
Merge branch 'master' of github.com:csantosb/elisp

Conflicts:
	.init.el.annotate.org
	my_orgmode.el