Font and custom-set-faces changes based on OS
Resolved merge commits in user.el and init.el