Change to jquery 1.11.1, which seems to satisfy all dependencies
Merge pull request #114 from JohnThomson/feature/reconcileBowerVersions

Change to jquery 1.11.1, which seems to satisfy all dependencies
Another try at fixing test for running on the live site
Merge pull request #115 from JohnThomson/feature/fixLiveSiteTest

Another try at fixing test for running on the live site
Merge pull request #116 from BloomBooks/develop

Merge develop to master