Add Yasnippet for snippet expansion.
Merge branch 'master' of github.com:jezcope/dotfiles

Conflicts:
	emacs.d/init.el