Lots of little fixes in here

This adds quantum & horizon. It also fixes some keystone issues. Swift is still a bit pearshaped however. This does however, complete the backports of the summit bits into the cookbook.