Clean up init.el

Mostly removing stuff I had commented out now that it is committed