Merge pull request #18 from ZomgPonies/master

Merge from Master
Fixes movement

Because Fox is a dumbass.
Merge pull request #431 from Fox-McCloud/MapFix

Map fix