cllean up
Update author.rb
Update author.rb
Update author.rb
resolve conflicts
resolve conflicts
fix update in authors
Merge branch 'chat-follow'
add us-west-2
add endpoint to carrier_wave
add fog_directory
use google as provider
resolve conflicts