Conditionizr v3.0.0
Merge pull request #1448 from toddmotto/master

Conditionizr v3.0.0