Merge develop into master for 0.0.7 release

Experimented with GitFlow, but won't be using it going forward.