merge conflict
Setting up organization form
Merge branch 'master' into design
Update copy on provider login page
Clean up and style organization sign up page
Styling search
Merge branch 'cleanup-search' into design

Conflicts:
	app/static/css/application.css
Fixing google analytics
Adding tooltip to location
Merge branch 'master' into design
Merge branch 'design'

Closes #19, closes #20, closes #21