preparing navlinks for publish push
Merge branch 'master' of github.com:tkwidmer/refugerestrooms
Remove nearby action on bathrooms collection
Remove guess action on bathrooms collection
Merge remote-tracking branch 'upstream/master' into feature/fold-bathroom-collection-actions-into-index
Add acceptance test for map display of restrooms
changed erb files to haml
Remove list action on bathrooms collection
Add missing Cucumber map steps
Merge pull request #121 from RefugeRestrooms/feature/fold-bathroom-collection-actions-into-index

Fold bathroom collection actions into index
simplifying haml
merging changes
remove html2haml from gemfile
Merge pull request #122 from RefugeRestrooms/erb_to_haml

Erb to haml
add bathroom id for contact
Fix Conflicts
Merge branch 'master' into contact_id

* master: (25 commits)
  remove html2haml from gemfile
  simplifying haml
  Add missing Cucumber map steps
  Remove list action on bathrooms collection
  changed erb files to haml
  Add acceptance test for map display of restrooms
  Remove guess action on bathrooms collection
  Add pry and quiet assets to Gemfile in test and dev
  Remove nearby action on bathrooms collection
  Clean up Gemfile
  Configure application to generate rspec tests
  Update README to indicate tesing requirement for contribution.
  Update links to related projects
  Update badges to point to new repository home
  Remove test helpers.
  Converts Rating Level model test to spec
  update readme to add ruby version
  Converts Bathroom model test to spec
  Remove remaining empty tests.
  Remove blank helper tests.
  ...

Conflicts:
	Gemfile.lock
	app/views/bathrooms/show.html.erb
Update boot.rb
update gemfile.lock
Merge pull request #124 from RefugeRestrooms/contact_id

bathroom ID is automatically included when a user clicks the contact us from the show page.
Merge master into convert-votes-to-update