Update readme with instructions for local setup
Lock gems and remove fixme note
Merge pull request #21 from TeaWithStrangers/lock-gems

Lock gems and remove fixme note
Remove unneeded host assets from repo
Merge branch 'master' of github.com:TeaWithStrangers/tws-on-rails

Conflicts:
	app/assets/.DS_Store
Fix Registration Failure caused by mailer template

The mailer template was calling `url_for` incorrectly, throwing an exception and
causing registration to fail.

Fixes #23
Document Env var and Role creation
Merge pull request #20 from TeaWithStrangers/readme

Update `README.md` with instructions for local setup
Merge pull request #24 from TeaWithStrangers/registrations-fix

Registrations Fix
Purge .DS_Store files
No hosts page for cities
city specific schedule link in flake email
undo flake email change
merge
no hosts page styled and no hosts schedule page
schedule specific link in flake email
Merge pull request #27 from TeaWithStrangers/no-host-city-page

Add 'No Host' Layout for City Pages
link host avatars
clearer homepg copy
copy changes