Update to Bootstrap 3.1.1
Merge pull request #988 from roots/bootstrap-3.1.1

Update to Bootstrap 3.1.1
Merge remote-tracking branch 'upstream/master'