master: remove map files
omega: merge master
Merge pull request #31 from rob-bar/omega

Omega