changes to class experiment and related classes
Merge branch 'master' of github.com:mfrey/baltimore

Conflicts:
	experiment/experiment.py
	experiment/experimentresult.py