update to bootstrap 2.3.1
rename navbar-googlebar to navbar-masthead and navbar-googlenav to navbar-toolbar
Include reverted changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #91 from acmetech/master

Make names consistent and update bootstrap