add email aliases and classpaths to lisp and perl stuff
fix merge conflicts