Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge remote-tracking branch 'origin/develop'
ALM-404 use hostname from config/settings.yml in tests
Changed version to 2.10.1
ALM-581 refactor pmc source and add to public repo
ALM-581 multiple journals for pmc source
Merge branch 'master' of github.com:articlemetrics/alm

Conflicts:
	Cheffile.lock
	vendor/cookbooks/alm/attributes/default.rb
Merge branch 'master' into develop

* master:
  ALM-581 multiple journals for pmc source
  ALM-581 refactor pmc source and add to public repo
  Changed version to 2.10.1
  ALM-404 use hostname from config/settings.yml in tests

Conflicts:
	Cheffile.lock
	app/models/sources/pmc.rb
	db/seeds.rb
	spec/factories.rb
	spec/models/pmc_spec.rb