Updated everything to work with Heist 0.13
Merge pull request #2 from Gondlar/heist013

Updated everything to work with Heist 0.13