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

Update to Bootstrap 3.1.1
Merge branch 'master' of https://github.com/roots/roots into roots-master
Merge branch 'development' of github.com:shoestrap/shoestrap-3 into development