Merge in test-suite, docstring fixes, release prep
authorDavid Bremner <david@tethera.net>
Sat, 22 Oct 2016 15:44:39 +0000 (12:44 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 22 Oct 2016 15:44:39 +0000 (12:44 -0300)

Trivial merge