make updates
Merge branch 'master' of https://github.com/drumwagon/crawl
Test maps inclusion
Merge branch 'master' of https://github.com/drumwagon/crawl