WIP melpa
Restored some plugins