removed pyflake warnings
added neighbourhood checks
added and tested the adding of neighbours to an Entity