Berksfile site location has been replaced by the source location
Take out .rubocop.yml FileName exception, fixes #74
version 2.0.0 of the New Relic cookbook
Merge branch '2.0.0'
Merge branch 'master' of github.com:escapestudios-cookbooks/newrelic
Merge branch 'master' of https://github.com/escapestudios-cookbooks/newrelic

Conflicts:
	recipes/meetme-plugin.rb
	recipes/php_agent.rb