Preparing to remove configobj in favour of json
Major changes to config file

Simplified (maybe) - everything now in one json file