generated intersection model
refactoring neighbour syntax
discover_site_0 half working
discovers site 0 when no neighbour 5 or 0 present
discovering all site 0's properly (with tests)
whitespace change
fixing conflicts and a test
Merge branch 'intersections'