Reorganise Javascript files into directories.
Quick fix for token bugs.
Merge branch 'master' of https://github.com/jamesg/photoalbum