Better Activity object mapping
Merge branch 'master' of github.com:e14n/pump.io