giving DeliteIfThenElse a unique name (for Forge)
Merge branch 'wip-develop' of github.com:stanford-ppl/Delite into wip-develop