more fixes for js
Merge branch 'master' of github.com:compete/meadowlark