Several extract method refactorings
compare_ok will replace all regex matches on the line
Fully test the archive creation and a small refactor
Merge branch 'fireteam2' into gb_master