Fix handling of default options

The previous approach overwrote all the options with the ones from the
`DEFAULT_OPTIONS` dictionary. Reverse this, so that the options passed
in overwrite the default ones.
Merge pull request #19 from pneff/master

Fix handling of default options

Thanks Patrice. I get that backwards all the time.