pep
merged
pylint
merge
Merge branch 'dock_refactor' of github.com:AIFDR/inasafe into dock_refactor
fixed all pep8 and pylint
fix problem when reading file with no keywords
Resolved merge conflicts