fixed some merging problems with the JS
Merge branch 'master' of https://github.com/wchamilton/phila