make navbar-text float left
move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b)
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext

Conflicts:
	dist/css/bootstrap.min.css