I fixed the remaining merge conflicts in MMapInterface.v
At least, I think I did. I'm not 100% sure I made all the right
choices for which code to take. So if it looks like I messed up,
feel free to go back to the way things were. Sorry!

The only meaningful changes I made before the merge
were to the end of the file, the part that was at one point commented
out. So as part of fixing problems that I've introduced (if any)
don't change that unless you absolutely need to for some reason.
Merge branch 'master' of https://github.com/scuellar/MMap