Changed the way calculated props are included
Merged master on to branch
Added merged_rev to create mapping
Merge pull request #384 from ENCODE-DCC/cal_props

Cal props