Updated celery routes and tasks to use correct queues and recommended syntax [PD-451]

@tdphillips you probably need to look at this.

All tests pass.
If this annoys anyone then I'm fine with changing it back, but I personally am annoyed that it's not there by default.