Merge pull request #24 from marsmith/master

update map
Merge pull request #25 from marsmith/master

add reset button, remove map padding
Merge pull request #26 from marsmith/master

several map interface tweaks
Merge pull request #30 from marsmith/master

some more map tweaks
Started adding methods to handle execute methods, refactored some names
Fixed merge confilicts
Merge pull request #31 from jknewson/master

Started adding methods to handle execute methods, refactored some names