3.1.0 prep.
Merge pull request #162 from mhaskel/3.1.0-prep

3.1.0 prep