maybe fixed travis build and some documentation
Merge branch 'master' of https://github.com/fwk/Di