Removing old map file
Refactored to avoid circular includes
Added scripts to clean up files (Windows one is untested)
realized map-e-common was unnecessary
Added main function and related functions. Added functions that take a char-struct and room-struct to item and npc modules (as prep for calling perform-item-transaction and npc-encounter).
Un-refactored character and combat (they didn't need to be split).
Fixed some bugs related to the use of (member ...) and '(*lists* *like* *this*) (they result in lists of symbols rather than lists of constants).
Moved map-e::in-dir to utilities and renamed it.
Added update-room-at-coords helper in room-common.
Fixed other assorted bugs.
Removed Resources/Rooms/1-1.txt from source control (it's a generated file).
(Apparently, clean/incremental diffs are considered overrated tonight.)
Merge branch 'master' into no-circular-imports

Conflicts:
	DungeonCrawlJr/acl2/character.lisp
	DungeonCrawlJr/acl2/combat.lisp
Merge branch 'master' into no-circular-imports

Conflicts:
	DungeonCrawlJr/acl2/main.lisp
Fixed some minor bugs with number to string conversion
Merge pull request #15 from ou-se-sp14-team-stallman/no-circular-imports

Refactored to remove circular imports, and added main functions