Merge branch 'master' of https://github.com/eglyph/devenv

Conflicts resolved in README
Merge branch 'master' of https://github.com/eglyph/devenv