merging changes from development
Merge branch 'master' of https://github.com/FoodCircles/food_circles
updating postgres password for staging
updating postgres user password
added companies_controller
added company_signup and company_notify to user_mailer
added company_signup and company_notify to user_mailer
added company parameter
removed extraneous socialbutterflies model
ensure validators directory autoloads
created email_validator
added email validators to user model. allows nil email on first creation of user.
added email validations to payment_notification model
added email validations to remind_list model
added email validations to venue model
generated controller for nonprofits
created nonprofits controller
added nonprofits_signup and nonprofits_notify to user_mailer
added markup in nonprofits#index view. configured routes for nonprofits.
adding omniauth for facebook and twitter authentication