Prep for 1.0.4 release.
Merge pull request #196 from mhaskel/prep-1.0.4

Prep 1.0.4