Add Formicids, remove obsolete skills.
Merge remote-tracking branch 'cao/cao-new'
Allow use of obsolete skill abbreviations in queries.