Removing vestigial local variable.
Improved update vs. save for Desk objects.
Removing more vestigial code leftover from Desk API 1 implemetation.
Don't count six conditional when it comes to coverage.

We know both branches will be run by Tox and Travis.
Import TestCase from our six compatibility module.
Removing unused code paths.
Ignore coverage generated files.