Bumped to 2.1.0
Scrollspy and so on
Saved patch of Bootstrap for later use
Merge branch 'master' into gh-pages