Merge branch 'master' into cli-refactor
Check for Jake/gen commands sooner, allow them to parse options
Merge branch 'master' into cli-refactor
Merge branch 'cli-refactor' into migration