Started rewriting Mapper.py after style guidelines
Merge branch 'master' of https://github.com/Skjulet/Mapper