Set up for v0.4.1 release.
Reverted version to 0.4.x after 0.4.1 release.
Merge branch 'v0.4.x' into merge-v0.4.x

* v0.4.x:
  Reverted version to 0.4.x after 0.4.1 release.
  Set up for v0.4.1 release.
Merge pull request #8 from ajdawson/merge-v0.4.x

Merge v0.4.x