Old bootstrap -> new one
Merge branch 'update' into gh-pages