Fixed merge bugs that were caused by the means of identifying location changed.
Remove some uneccesary documentation
Merge branch '0.4' of github.com:NCFDev/cellular into 0.4
Not actually sure why there were merge conflicts, but it was basically just removing old code that for some reason showed up again, so there's no reason for anything to actually conflict after this commit.
(Hopefully.)

Conflicts:
	cells.py
Made Cells have unique colors
Random Colors for cells
Update display.py
Update display.py
Update display.py
Update cells.py
Update cells.py
Update cells.py
merge Merge branch '0.4'

Conflicts:
	display.py
Update display.py
Merge branch '0.5' into 0.5.richard

Conflicts:
	cells.py
	display.py