Update to heat master

Some features that we want are on master
Failed to clean up stash conflict

Update the git sha appropriately
Merge pull request #326 from craigtracey/heatversion2

Update to heat master