Josh: Fixing screwed up commit that included files from the old site. Updated concatenated js file since it was breaking