Added support for elpa packages
Fix init.el comments and add default c++ style