Merge lib/dpd_reports into Mailing model

Each reports is also now added to the db immediately after being read,
which should prevent multiple reports being lost if there is an error
after reading, but before adding to the db.
Merge branch 'master' into openshift

Conflicts:
	lib/dpd_reports.rb
Merge lib/dpd_reports into Mailing model

Each reports is also now added to the db immediately after being read,
which should prevent multiple reports being lost if there is an error
after reading, but before adding to the db.
Merge branch 'master' into openshift

Conflicts:
	models/mailing.rb
Merge lib/dpd_reports into Mailing model

Each reports is also now added to the db immediately after being read,
which should prevent multiple reports being lost if there is an error
after reading, but before adding to the db.
Merge branch 'master' into openshift

Conflicts:
	models/mailing.rb
passive ftp