add default host for action mailer in production. TODONE....
configure sendgrid for production
break jbuilder show out into partial

Conflicts:
	app/views/api/v1/water_fountains/show.json.jbuilder
water_fountain resource is consistent across index/show
the jbuilder partial lives under api/v1
move nil check logic back into model
fix ios authentication - using correct haml interpolation syntax
Merge pull request #17 from wetap/feature/fountain_thumbnail

Feature/fountain thumbnail
add instructions for local calabash testing
Merge pull request #18 from wetap/feature/update-readme-with-local-testing-instructions

add instructions for local calabash testing
error messages fit on screen
rename something more semantic, change order of inclusion (iphone last)
break logo out into partial
mobile login styles
branch the new registrations template
break out color variables, style input elements, add placeholders
move navigation links into login header. style header area
check styles on 3.5 inch iphones
WIP social login, update image assets
redisplay error messages