Update composer
Updating to phpunit 4.1
Some typos in README
Merge branch 'master' into develop
Resolving circular dependencies