Simple graph construction working.
Merge branch 'master' of github.com:a-price/rubble
Fixing apparently bad merge.