Merge master into gh-pages

Merging in changes to gh-pages (navigation per #4)