Added abbrev defs; minor changes to init.el