Work towards merging "options" and "parameters".

For #44. A fair way to go with this - code most likely broken at the moment,
although tests pass (but some removed). parameters.py has been removed.