Working for now
Merge branch 'master' of github.com:anomalylabs/streams

Conflicts:
	composer.json