Merge remote-tracking branch 'upstream/master' into ensemble_cleanup
Merge pull request #69 from dwhswenson/ensemble_cleanup

Ensemble cleanup