I hope this stuff doesn't break anything... working on user-configurable black/whitelists of devices to use for storage on clusters
Merge remote-tracking branch 'origin/feature/brian_1.2_features' into feature/brian_1.2_features

Conflicts:
	templates/setup_volumes.pl