Update README and configure mapping
Merge branch 'master' of github.com:meltingice/deviant