Merged OSX changes into init.el