Merge branch 'staging'
Remove deprecated collisions fields accref, accyr
Rename legacy 'toolkit' references to 'cyclescape'