added active class for primary nav links
Merge branch 'master' into gh-pages