Remove bootstrap from npm (wrong one) and sync
Merge branch 'master' into feature-browserify