closes #290

Update activity models for exclusive/concurrent appliances
closes #356

Remove Maximum Power field from the form of Maximum Power Pricing scheme