Reapply bordermaker branch
Missing files
Fixups
Remove logging
Allegiance tweaks
WIP border maker
MSEC for routes; error handling