Merged oldbox and rofldell's Emacs init files