Fix regular expressions - now should work for *most* FAAM/ARSF/SAFIRE data