This needs to be merged up with the new documentation that's in place in the `bootstrap3` branch