left out some stuff
Merge branch 'master' of github.com:croeder/biomedner