placeholder commit.
placeholder
incremental commit of madness.
seemingly functional now.
Merge branch 'master' into auto-rerun

Conflicts:
	server/lib/dre/index.js
	server/lib/match/index.js
Merge pull request #144 from amida-tech/auto-rerun

Auto rerun