Cleaned up variables and functions
Test update

put a couple props in the mountains, not particularly important just
testing.
Merge branch 'master' into iss65
Merge pull request #25 from InebriatedSquirrel/test-(Frankie)

Test update
Map changes
Level merge
Fixed level spawning