Quick modifs on grid_init
Merge grid_init with grid functions
add set_uniform_grid
Merge branch 'master' of github.com:SteveViss/C-STMFor

Conflicts:
	test/grid_cell_test