Minor work on Environment test, trying to resolve conflicts with vector tests.
Redundant- Ignore this commit.
Resolved conflicts
Merge branch 'master' of https://github.com/NCFDev-Fall2013/Cellular-II

Conflicts:
	test.py
	vector.py
Fixed minor conflicts and syntax errors and removed leftover merge messages
Merge branch 'master' of https://github.com/NCFDev-Fall2013/Cellular-II
Resolved minor syntax error in vector