Merge pull request #195 from Smoss/master

Updates and fixes to test and a fix to recent activity
Fixed emailing so.