Merge pull request #247 from rjocoleman/develop

config:set fix --encrypt input option