Additional modules goto-last-change, yasnippet and magit.
Merge branch 'master' of git://github.com/svetlyak40wt/dot-emacs

Conflicts:
	.emacs.d/init.el