Fixes #6419 - Change the default org name
Merge pull request #4359 from daviddavis/temp/20140627104301

Fixes #6419 - Change the default org name