- Rename PublicActivity.with_log/without_log to with_tracking/without_tracking
- Cosmetic changes to merged code (spaces)
- Added missing specs for without_tracking/with_tracking methods.