Fixes #273 and #196

Aside from the fixes for those bugs, you should also be able to access the options from the commandline via the config: site.config.options
Fixing 1.8.7 breakage.
Merge pull request #329 from LightGuard/issue_273_196

Fixes #273 and #196