Refresh optdefs to match options
Fix Systemd spelling/capitalization (fixes #160)
Merge pull request #161 from akx/Fixes

Fixes