use array to combine four grids instead of combineGrids api
minor update for intellij12 settings.
move isl.py down into the python directory where it belongs.
Jindent
Merge remote-tracking branch 'origin/master'
Adding 2D grid trajectory
I commented out the change