Modified to use dynamic assignment of rectypes so we don't hardcode
recordtypeId field references on Oppty
Merge pull request #467 from SalesforceFoundation/feature/beta-10-rt-fail

Fix for beta 10 recordtype issues on oppty
Merge dev into feature/352-contact-merge