Allow entitlement file re-writing.

In some cases we want to use 'org' instead of 'com' for the
prefix. We could solve this by renaming our app ids and updating the
provision profiles. However, having already sent those out it would be a
pain the butt to replace.
Merge remote-tracking branch 'origin/master'