1.2.5 prep.
Merge pull request #79 from mhaskel/1.2.5-prep

1.2.5 prep.