Merge pull request #32 from colemanw/master

Abstract the is_active test
Fix undefined variable messing up non-event tabs