Cleanup elpa & work on init.el
Merge init.el