0.3.0 prep
Merge pull request #42 from mhaskel/0.3.0-prep

0.3.0 prep