only schedule whitespace keepalive if enabled
cleanup semicolons, whitespace and mutable default arguments
fix mutable default arguments :boom:
Merge pull request #310 from Mayflower/cleanup

Cleanup
Merge pull request #308 from Mayflower/develop

Serialize JID to allow json serializing
Merge pull request #309 from Mayflower/whitespace_keepalive

only schedule whitespace keepalive if enabled
Merge pull request #311 from Mayflower/develop

Revert "cleanup semicolons, whitespace and mutable default arguments"
Fix some more Unicode in **kwargs issues in Py2.6