cleaned up some code in analysis script
clear highlights w/ button (lightly tested)
Merge branch 'master' into gh-pages