Added SalesForce resource owner

Work mostly by @tylerism
Cleanup previous merge