Annoying file demands a commit.
Merge branch 'master' of https://github.com/picarresursix/regulus

Conflicts:
	emacs/emacs_dot_d/ac-comphist.dat
Added support of bibliography in org-2-pdf and added default EDITOR to zsh.zshrc.