Merge branch 'philfreo-patch-1' into 2.1.0-wip
prevent small tags from increasing height of headings
vertically align inline form content
Merge pull request #3986 from desandro/full-height-progress-bar

Full height progress bar
update buttons in docs to include type
remove specific values for the fluid grid system and instead use LESS's percentage() function
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Merge branch '21jumpst' into 2.1.0-wip
docs pre font-size and nowrap on prepend/append
reoder forms a bit
Wrapped btn:hover, btn.disabled inside .btn
fix up docs to use default container, fix responsive home changes
adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar
fix up carousel alignment and line-height
fix text in docs about default font-size and line-height
docs changes for icons
indenting
updating docs examples to remove 13/18 resets, fix up buttons alignments and carets
wasn't feeling the new buttons, downsizing again until we get a better balance
Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenthemes-2.1.0-wip

Conflicts:
	less/buttons.less