minor changes
Merge branch 'master' of github.com:mfrey/baltimore

Conflicts:
	analysis/delayanalysis.py
	experiment/experimentmanager.py
	experiment/experimentmanagerworker.py
	main.py