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
fix pluralization since "a" is in front
Merge pull request #7287 from waynn/patch-1

fix pluralization since "a" is in front for issue #6342
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
	docs/assets/js/bootstrap.min.js