resolve merge conflict
code reshuffling
update ceilometer config file with new format
add -l option and reduce debugging output
update author list
first havana patches
multiple bug fixes