Adding in active_admin with Organization model
Removing filters so that AA organizations list works
permit_params so editing works, used ID to correctly edit/view, customized columns
Custom index / show / form for orgs, added type
Start adding profile links to orgs, create User model
Beginning of showing users claiming orgs
moved dev setup to SETUP and wrote README
Proper relative linking for setup file
Let's be friendly to rbenv users
Intercom installed and working in local dev environment
Rebuilding with Auth0 config manually added
Enabled sending of custom data to Intercom - if subscribed to digest, and if the user profile is claimed
Removed Freshdesk widget and contact form, added Wufoo form
added note on contact to login and use intercom question mark & enabled intercom floating question mark
Merge pull request #1 from PixelCrafters/intercom

Looks like it can merge cleanly!
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
updates to homepage activity stream appearance
about page copyediting
Set Intercom app_id to test version
For sessions, switch from cookie_store to active_record_store