Merge pull request bennlich-world-object
- Tried basic github manual pull etc.
  - Failed due to my pulling out of order
  - Fix: roll back to starting point:
  	- git reflog .. find 3757116 HEAD@{2}: checkout: moving from gh-pages to master
  	- git reset --hard 3757116
- Used cherry picking suggested by Benny:
	git cherry-pick --no-commit 24c7d8c
		git add . to resolve unmerged pathes (agentscript map/min.js)
	git cherry-pick --no-commit 89abd0c
		both modified:      models/gridpath.html
		fixed by editing out the git in-file comments
Commit to rectify derived files; no source file changes
    modified:   docs/5-model.html
    modified:   docs/6-template.html
    modified:   lib/agentscript.js
    modified:   lib/agentscript.map
    modified:   lib/agentscript.min.js
    modified:   src/agentscript.coffee
Merge branch 'master' into gh-pages