bugfixes
Merge branch 'new_data_model' of git://github.com/algorithmica/geograph into new_data_model