Added static qualifiers to appropriate functions
Updated the test suite a bit for compatibility with multiple modules
Merge branch 'dev/gridcell'

Conflicts:
	grid_cell.c
	test/grid_cell_test