small changes to grid and csa.  Premerge commit.
Fixed minor conflicts in merge.  In csa, removed nxutils import.  In grid using Paul Hobson's method to import the library.

Merge branch 'master' of https://github.com/hetland/pygridgen

Conflicts:
	pygridgen/csa.py
	pygridgen/grid.py