Okay, getting off master now
Map can scroll now! Wooh!
Merge branch 'master' into grenade