Modified files .gitignore, .gnus.el and init.el.
Merge branch 'master' of github.com:paulotome/.emacs.d

Conflicts:
	.gitignore