follow prototype
update to proxy controller due to duplicates appearing when actor.aid=proxy.aid
Add type to actors and objects in ActivityController.
Show followed in snippet.
Changes to make follow members activities to display in the snippet
Fixing styling issues in the code
Merge pull request #29 from natgeo/mm/followprototype

Changes to make follow members activities to display in the snippet
upped version
Fix tests.
Uncomment something
Explicitly close neo4j test connection
Don't explicitly stop fake neo4j
Ensure fake neo4j is listening
Stop fake neo4j
use nock for neo4j
Remove commented stuff
Merge pull request #31 from natgeo/ls/fixTests

Fix tests. Someone please merge!
Merge branch 'develop' into followprototype

Conflicts:
	api/policies/isAuthenticated.js
Remove commented lines; fix indentation
Merge pull request #30 from natgeo/followprototype

Followprototype