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
view refinements
Merge pull request #27 from mule-deer-2013/org_form_additions

Org form additions
youtube1
merger conflicts
added some translations
Merge pull request #28 from mule-deer-2013/view_edits

added translations and better seeding
fix polymorphic bug for people association
added explicit require Faker to hopefully fix heroku error for seeding
fixed layout issue for homepage search box
Merge pull request #29 from mule-deer-2013/fixsearchbox

Fixsearchbox
renaming to fix case problem on Heroku
we use jQuery, not Zepto
replace modernizr, normalize, and foundation <link> and <script> tags with Rails gems
ensure that search results are always organizations
org model adjustments for nested attributes and foundation styling add to form
Merge branch 'master' into formtues
added logo_url to org table