Fix homepage sign in link
Departing and Arriving button now in place and working
Potential fix for sign-in issues
Potential fix for sign-in issues
destroy session
Revert "update to use kiosk namespace"

This reverts commit 9aee6b23a077242d72bd6787169e7ed7246c4d70.
Merge pull request #78 from CG-CamSys/testmerge-quinn

Merge camsys/oneclick
Merge branch 'cgdevelop' into 168-hide-keyboard-on-location-input-blur

Conflicts:
	app/views/devise/sessions/new.html.haml
	app/views/trips/_trip_form.html.haml
fix merge errors
fix more merge errors
Merge pull request #64 from CG-CamSys/168-hide-keyboard-on-location-input-blur

close cocoa keyboard on to/from text input blur
Merge branch 'cgdevelop' into 131-arrive-depart-toggle

Conflicts:
	app/assets/javascripts/trips/trips.js
	app/views/trips/_new_or_edit_form.html.haml
	app/views/trips/_trip_form.html.haml
remove duplicate trips.js
Merge pull request #79 from CG-CamSys/131-arrive-depart-toggle

Departing and Arriving button now in place and working
Merge branch 'cgdevelop' into 187-duplicate-trips-js
Add buildpacks and vendor_urls for rgeo stuff hopefully.
Drop the rgeo buildpack
Force deploy.
Remove rgeo gems for now.
Add back rgeo gems.