Added ELPA and consolidated some elisp from platorm specific stuff