Started working on the files.py
Resolved conflict
Small adjustments to align to PEP8
Merge branch 'master' of github.com:wtsi-hgi/serapis