I have no idea what's happening!
Merge branch 'master' of https://github.com/JC5/firefly-iii
I broke some stuff but it's fixed again.