Update composer.json to track ZF master

2.1 is now in master so we can stop tracking the develop branch. Yay!
Merge pull request #42 from davidwindell/patch-3

Update composer.json to track ZF master
ZendDb providers with tests
remove composer.lock