Upgrade to Bootstrap v3.1.1
Merge branch 'master' into gh-pages