Another batch of history
Merge branch 'master' of github.com:Rovanion/.files

Conflicts:
	.emacs.d/ac-comphist.dat
Merge branch 'master' of github.com:Rovanion/.files