additions to the org form, including adjustments in the models and controller; added some fields like preferred_name, twitter, youtube
fixed merge conflicts
more merge adjustments
Merge pull request #27 from mule-deer-2013/org_form_additions

Org form additions