Prefer dashes to underscores in filenames
Merge branch 'master' of github.com:orgsync/ekg into sendgrid

Conflicts:
	lib/adapters.js
	lib/adapters/new-relic.js