Some more mappings. Last commit to master branch before starting to work
in seperate branches.
Merge branch 'master' of https://github.com/cardamon/glorious-dawn.git