don't distinguish between options and other options

In the CIM model, these two are separated, as options are represented by
properties, and other options (file dependent) are specified in a special
property. The script should make using all options transparent and not
consider them two separate inputs.
Merge pull request #59 from boocz3ch/devel

don't distinguish between options and other options