fix conflict with main navbar and update partial
Merge pull request #17 from mule-deer-2013/navbarfix

fix conflict with main navbar replacing it with our new navbar and updated partial for it