fixed js string bug (again)
more bug fixes
Merge branch 'master' of https://github.com/timothythehuman/gmm-up