Merge "Added -q flag to showmap." into nyc-dev