0.2.2 prep
Merge pull request #23 from mhaskel/0.2.2-prep

0.2.2 prep