Fixes #6474: remove duplicate .btn border colors to make @btn-border work
Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states
Increase input group margin on bottom and vertically center to match inputs