Fixup template for our prefered list display
Update MarkerWithLabel
Missing import sys
Add some shibboleth support, and comment out favs