Merge branch 'readme' of github.com:zkessin/erlog into develop
Merge in upstream code