- fixed another merge conflict
Added stupidly simple .el to install all packages I need.