change how collapse works - collapse, collapsing, and in
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip