Rearrange templates so js doesn't get called twice. Removed extra local.js
Merge pull request #96 from yeastgenome/js-template-fix-3005

Rearrange templates so js doesn't get called twice. Removed extra local....
Merge branch 'master' into foundation-update-v5.4