Chateau unlock broken

Someone converted Data.js from UTF to Latin 1
Got to be wrong

no other reference to Molpy.noLayout
Refactored Options Handling

Now MUCH simpler to add and change
Merge pull request #813 from waveney/wav25

Refactor options and bug fixes