Bootstrap 3.1.0
Merge pull request #974 from roots/three_one

Bootstrap 3.1.0