Add test for class or_
Modify condition to use class or_
Takes unicloud dependencies out of setup.py
Resolve merge conflicts in condition.py