Merge pull request #21 from nphillips/master

I have mostly implemented the new 2-level nav -- need to polish further
updated nav bar and removed errant a tag
further refinements to the new 2-level nav