Merge in latest bootstrap v3.2.0

* Merge in latest master
* Revert breaking out theme, and force us to deal with merge conflicts so we know what's changing / breaking with our modifications. We'd have a merge conflict anyway with the whole theme file broken out, and this will result in *less* conflicts as we now have to deal with less files.

Rebasing master would be cleaner, but makes it a lot harder to work on, so merges appear to be the best strategy.