Rename memory to mem.
Merge branch 'master' of github.com:joewing/memsim