Misc. bug fixes & adjustments for content provider authority collisions.
Updated .gitignore.