remove Type pick list values
Merge branch 'feature/420-kill-globals' of https://github.com/SalesforceFoundation/Cumulus into feature/420-kill-globals