Add a few packages
Merge branch 'master' of github.com:mgregson/dot-emacs

Conflicts:
	packages.el