Cleaned up main package
Merge branch 'nospanversion' of https://github.com/bjonor/journal into nospanversion