Upgrade to bootstrap 2.3.2
Use the navbar menu from bootstrap
Minimizes changes to bootstrap.css to its minimum (ie. use a min-width media query of 1000px instead of 768px for collapsing the menu)
Put custom style changes to style.css only.