Refactor two availability collections into one

To remove duplicate FCO/Licensing code
Merge pull request #108 from alphagov/availability-refactor

Refactor two availability collections into one