removed the activity_rate options
Merge branch 'master' into contact_fixes
merging master
Merge pull request #5 from alecclarke/contact_fixes

Contact fixes