merge updates from datalogcompiler
Merge branch 'master' into production

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

merge production into master