Update to heat master

Some features that we want are on master