Merge develop into master for 0.0.7 release

This merge includes mostly bug fixes.  We explored using GitFlow, hence the merge from develop.  However we will be merging from feature branches into master going forward.