Merge branch 'added_node_state_map' of https://github.com/robjuffermans/libcloud into robjuffermans-added_node_state_map