Add ceilometer support

fix merge issues with #120