Minor modifications to annotation handling to support annotations in 2.3.0
Use string_types rather than basestring.
Removing unicode literal.
Use six.text_type rather than a unicode literal.
Do not attempt to set parameters unless they are explicitly defined in the incoming data.
Gracefully handle situations in which id or uuid is unspecified.
Merge branch 'fix_annotation_handling' into develop

Conflicts:
	taskw/test/test_utils.py
	taskw/utils.py
	taskw/warrior.py
Avoid hardcoding TZ in the test expectation.