Master into BEF

This should be able to get BEF up to master level. Where it should be. Woohoo.

please check to make sure I haven't screwed up someone's map commits before merging this