Added RequestException handling for CKAN API requests, needed with the new requests version. Fixed up tests due to changes in ckanext-archiver. Minor tidy up.