Move to more conservative versions of elpa packages and associated changes
Port some stuff from Emacs Starter Kit