3.2.0 prep
Merge pull request #200 from mhaskel/3.2.0-prep

3.2.0 prep