Adding focus/active link states, fixing test, cleaning up python template

A few fixes / updates.  I'll provide detail about them in a separate email.  Please merge these, test, and update your pull request (git push -f)!

*EXCELLENT* work!