Settings tidy up

Puts all settings in one file. I think this makes a lot more sense. What do you think @mlandauer?