2.0.0 prep
Merge pull request #172 from mhaskel/2.0.0-prep

2.0.0 prep