Updated everything to work with Heist 0.13

Just in case anybody else stumbles upon this and  wants to give it a try.