conditional CPM for if-then-else computed properties
Merge pull request #52 from TrueNorth/conditional

"conditional" CPM for if-then-else computed properties
Merge upstream changes