Separate CLI options and locals

[closes #1652]

This separates locals from options on the command line interface.

This is another potentially breaking change, so I think we should think about a 2.0.0 release really soon.