Merge pull request #41 from dewguzzler/master

directory activity is now tabbed hopefully with no conflicts