Minor JS fixies; Rename packages
Merge branch 'master' of github.com:Jarlakxen/bookshelf