Fixes #339.
Fixes #323.
Merge pull request #340 from artsy/readme

@orta => OSS Fixes