updating nav highlighting to handle active classes correctly
updating js to correctly apply active classes
Merge branch 'master' into issue/nav-highlighting
Merge pull request #96 from numfocus/issue/nav-highlighting

Issue/nav highlighting