Revert "Merge branch 'branch/twitter-bootstrap' into testing"

This reverts commit 4badf85099b68fc592d1d8e9fbf10bbb19f058cf, reversing
changes made to 07b079e171a4b838756712c661c3de34531647a7.