Squashed commit of starling fixes

In particular Sam's Ensime generator