Merge pull request #15 from zsweedyk/map

Map
Did quick cleanup of code, fixed Analyze issues
simplify several road puzzles, all verified to be winnable now
code cleanup in map and adding back the treasure chest
Fixed merge conflicts