Roll gridTool.js back temporarily
Merge pull request #3979 from huffman/rollback-gridtools

Roll gridTool.js back temporarily
merge upstream/master into andrew/thermonuclear