Agda and PG stuff
Merge branch 'master' of https://github.com/EliasC/.emacs.d

Conflicts:
	init.el