fix links
Merge branch 'bootstrap-site' into gh-pages