pushing aws issue
adds s3 host to paperclip defaults as us-west
Merge branch 'master' into mybranch