added a geocoder timeout
increased timeout
added icons back
pushing andy's updates
Merge branch 'master' of github.com:craynkshaft/iffy

Conflicts:
	app/assets/stylesheets/application.css.scss