Includes more stuff to go faster. [ci skip]

Also use journal_id instead of has_one :journal in JournalTaskType.
AMS isn't smart enough to just use the id, it seems.
Use new hash syntax
Merge pull request #501 from Tahi-project/admin-journal-speedup

Make the admin journal page load faster with more `includes()`