Merge pull request #24 from purplecabbage/2.7.0_ReleasePrep

2.7.0 release prep