Added back the functors.
Added functionality for merging fmap expressions.
Merge branch 'master' of github.com:stanford-ppl/LoopTransformation