Cleaned up conflicts in providers namespace. Still has tests to
be ported to records.
Merge pull request #582 from blrm/my-records

Cleaned up conflicts in providers namespace. Still has tests to be ported to records