Merge pull request #1 from ThomasWunderlich/master

Fix typo in docblock
Avoid circular dependency errors in travis

Don't let composer guess this packages version, override it to be dev-master