merge updates from datalogcompiler
Better handling of enabling/ disabling interaction with graph
Conflicts:
	appengine/js/demo1.js
	appengine/js/graph.js
Refactor graph and make sure we see the fragment label when not expanded
Conflicts:
	appengine/js/graph.js
Add missing query plan.
Merge remote-tracking branch 'origin/master' into viz-improvements

Conflicts:
	appengine/js/graph.js
Merge pull request #54 from uwescience/viz-improvements

More improvements for viz
Merge branch 'master' into production

Conflicts:
	datalogcompiler
update submodule path
Merge pull request #59 from uwescience/production

merge production into master
Merge branch 'master' into domoritz-new-editor