Merged changes to init.el