Implemented map, renamed to CatanMap

A few other minor fixes