Merge dev into master.

[rivermont]

Checklist

• [X] This Pull will not add the same thing as another currently-open request.
• [X] This Pull does not commit any keys, passwords, personal data, or other private information.
• [X] I wrote at least some documentation for this feature.

Will update the README, Travis CI, PyPI accordingly with these shiny new features. I didn't do anything here!