Commented out secondary jquery.js -- not sure why we have it?
Fixing merge conflicts