Updating active color to be consistent, not confused with link colors
Merge branch 'master' into gh-pages