Fixing the docs for columns
Merge branch 'bootstrap3' of https://github.com/simonyeldon/bootstrap-shortcodes into bootstrap3