Untested admin teleport improvements

Assume working.  Need to merge everything for huge 3.1.2 merge.  Dangling branches could cause huge issues.  Will reverse out or bug report any problems.