Merge branch 'testing' into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 17:53:21 +0000 (12:53 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 17:53:21 +0000 (12:53 -0500)
tasty updates from testing branch--best stuff is the archiver script mods


Trivial merge