0.4.0 prep
Merge pull request #87 from mhaskel/0.4.0-prep

0.4.0 prep