3.1.1 prep
Merge pull request #13 from mhaskel/3.1.1-prep

3.1.1 prep