0.3.3 prep
Merge pull request #74 from mhaskel/0.3.3-prep

0.3.3 prep