Add env.sh and pick local/github diff out of makefile to env.sh.
Now usage:
    source env.sh local /
    source env.sh github
Merge branch 'master' into gh-pages

Conflicts:
	makefile
rebuild for github