added enabled/logging_enabled, minor clean-up
Merge pull request #67 from sholland/enabled_disabled_fw_rule

added enabled/logging_enabled, minor clean-up