Upgrade to Bootstrap 3.3.0
Merge branch 'master' into gh-pages