Removed the use of 'numbering' from numerous places
- There is an odd bug when using the Template network that I cannot track down...but other networks are fine.
Merge remote-tracking branch 'origin/feature/MajorReno' into feature/MajorReno

Conflicts:
	OpenPNM/Network/__GenericNetwork__.py