Work on PMP importer
Merge remote-tracking branch 'origin/master' into pmp-importer

Conflicts:
	Gemfile.lock
Remove rb-readline
Finish PMP article importing; add specs
Gemfile.lock update
Add some missing web mocks
Fix spec
Add pmp config to api config template
Add URL to remote articles
Add missing keys to pmp config [ci skip]
Merge remote-tracking branch 'origin/master' into pmp-importer
Merge remote-tracking branch 'origin/master' into pmp-importer

Conflicts:
	Gemfile.lock
Add source/news_agency to pmp importer
Merge pull request #184 from SCPR/pmp-importer

Pmp importer
Log cleanup
Watch app/importers for resque
Handle when a PMP response has no 'items' node
Fix js error for null to_title [ci skip]
Merge remote-tracking branch 'origin/master' into rails4

Conflicts:
	Gemfile.lock