CDB-2891 Added extra fields to Organization

- Description
- Discus shortname
- Display name
- Website
- Twitter username
Merge branch 'CDB-2891' of github.com:CartoDB/cartodb into CDB-2891