Tree view corrections and speedup -- control mapper is slow to load on PCI, but that will be a future commit to address that.
speedups for tree view and control mapper.  Not optimal yet but better than before
Fixed the query builder in TreeViewController to set the parent param correctly
Merge pull request #40 from reciprocity/feature/null_attribute_queries

Client side speedup against null attribute queries
Fix conflicting migrations
Resolve DEV_PREFIX to a non-relative path in init_env.
Rename migration files to be descriptive.
Merge pull request #41 from reciprocity/feature/clean_up_migrations

Fix conflicting migrations
Changes to make behave tests compatible with CI

* change default port to 9000 to not conflict with dev server
* update dev-requirements.txt to point at behave on Github
* shuffle common functionality into utils module to make tests
  compatible with newest behave
Add --format progress switch to run_behave
Fix some behave tests

* fix attribute overrides in ModelFactoryMetaClass
* add DirectiveFactory to produce valid 'kind' properties
* change query test to use valid 'kind' property
Client side performance optimizations, cutting down on unnecessary events on initial load of models, dropping jquery-migrate since I found the new evil way to get an element's bound events, and calling renderLive instead of render on control listing in the selector
Enable Jinja2 autoescape

* also remove 'safe' filter in tooltip descriptions until
  we integrate tag/attribute whitelisting
Use specific tag for behave
Merge pull request #45 from reciprocity/feature/autoescape-templates

Enable autoescaping for Jinja2
Merge pull request #43 from reciprocity/feature/null_attribute_queries

More client side speedup against null attribute queries
Merge pull request #44 from reciprocity/feature/enable-junit-with-behave

Upgrade 'behave' package to 1.2.3a19
Merge remote-tracking branch 'origin/develop' into feature/rbac_clean

Conflicts:
	src/service_specs/query.feature
	src/service_specs/steps/http.py
Don't use migrations for tests