AIFDR/inasafe — pull request #889 by timlinux (2014-03-16 21:58:20+00:00)
Title: Fixed pep8, pylint issues and recreated resources which was causing test...

... failures do to merge conflicts