yasnippets
projectile, ack and ag
erge branch 'master' of https://github.com/daniellawrence/dot-files

Conflicts:
	dot-emacs