File save now works.
Fixed some compile errors.

Conflicts:
	bin/demo.js
Merge branch 'master' into gh-pages