Update documentation
Add map merging functions
Merge branch 'master' of github.com:jknowles/eeptools