journo_merge improvements
Merge branch 'master' of github.com:bcampbell/journalisted