Upgrades

Upgrade to jquery 2.1, bootstrap 3.1, and fix various minor issues.