Addded yasnippets
Merge branch 'master' of github.com:daniellawrence/dot-files

Conflicts:
	dot-emacs