Revert "btn-navbar gets .btn class"

This reverts commit 54a640304ed9d3792c072f313a2e070a6bb59eee.
Revert "change .btn-navbar - take out .navbar in its rules"

This reverts commit 52021dbe351f14903f8aa65f571dacdffbe3c914.