Upgraded to flysystem 0.6
Merge remote-tracking branch 'origin/1.0'

Conflicts:
	composer.json