Add  annotation and add to CLI flow
Cont'd working on OAuth stuff. Works well with Dropbox plugin
Merge branch 'feature/issue297-oauth' into feature/issue297-wizard