Merge pull request #34 from natgeo/develop

Update master with develop
Merge branch 'develop' of github.com:natgeo/activitystreams
Merge branch 'develop' of github.com:natgeo/activitystreams
Merge branch 'develop' of github.com:natgeo/activitystreams
fixed caching issue, not pointing to redis based on conf