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
Use the chart parameter name in the side legend for consistency.  That
way with the new netCDF 4.3 names, if the user overrides them, the side
legend is still readable.
Jindent
Merge remote-tracking branch 'origin/master'
More calendar date time stuff