Change the way jquery is loaded.
resolved merge conflict.
Merge pull request #33 from optimizely/krush/build-fixes

Change the way jquery is loaded.