Update readme to reflect unified codebase
Make sure the preferred Windows keyring is mentioned in the intro
Force mercurial demand import to detect presence of pyfs. Fixes #114
Added tag 3.0.4 for changeset b24852dba2e0
Bumped to 3.0.5 in preparation for next release.
Merge