Pull in latest Bootstrap
Merge branch 'bootstrap-3' into bootstrap3/stewart