Add consul and other random fixes

I've finally got working test runs with this. Keystone, Glance, Neutron and Nova are all working afaict.