Backport v3's readme update on npm install to 2.3
Merge pull request #6967 from twitter/readme_npm_fix

Update readme npm instructions
le sigh
pass true to cycle
rebuild
only pass unique options through to child nodes in tooltips
WHOOPS ( >_>)
whitespace
rebuild
2.3.1
woops that should stay 2.3.0
shiiiit
update changelog
Merge pull request #7111 from twitter/2.3.1-wip

2.3.1 wip
Merge branch 'master' of https://github.com/twitter/bootstrap into typeahead-updater

* 'master' of https://github.com/twitter/bootstrap:
  update changelog
  shiiiit
  woops that should stay 2.3.0
  2.3.1
  rebuild
  whitespace
  WHOOPS ( >_>)
  only pass unique options through to child nodes in tooltips
  rebuild
  pass true to cycle
  le sigh
  Backport v3's readme update on npm install to 2.3

Conflicts:
	js/bootstrap-dropdown.js