added more dependencies
cleanup, switched back to non-minimized version for debugging
Merge branch 'master' into gh-pages