Add nightmare as dependency
Add SalesForce
Merge branch 'master' into salesforce

Conflicts:
	config/env/staging.json
Merge pull request #38 from AnyFetch/salesforce

Salesforce