Merge from shred_helicopters (also includes the changed ignore.conf file that seems to keep changing)