1.0.0 prep
Merge pull request #25 from mhaskel/1.0.0-prep

1.0.0 prep