Pulls back map changes.  Put those in BEF.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge branch 'master' of github.com:Baystation12/Baystation12