Current work checkpoint. See diff for details.
Merge branch 'develop' of github.com:dreamfactorysoftware/console-tools into develop