0.7.0 prep
Merge pull request #97 from mhaskel/0.7.0-prep

0.7.0 prep