Cleaned up keystone cookbook
fix merge conflicts