v1.2.6 merge v1.2.5-dev updates to master.
Merges v1.2.5-dev updates to master, with version bump for PyPi package.
New code is still pretty messy, issues to be cleared up for v1.3.0.
Merges v1.2.5-dev updates to master, with version bump for PyPi package.
New code is still pretty messy, issues to be cleared up for v1.3.0.