Only compare existance of files, not content
Merge branch 'fireteam' into gb_master