BEF --> master merge: JUST DO IT ALREADY

Master is 929 commits bheind and counting.
All serious issues discovered during playtests are fixed, and some more.
Time to get this baby on server