Bootstrap upgraded to 2.3.1.

Also fixes some minor bugs (like issue #334)