Update the org merge copy to be more accurate.

The selected org gets merged into the one that the admin is viewing.
Merge pull request #600 from opscode/org_combine_copy_update

Update the org merge copy to be more accurate.