testing push
added AWS s3 info to fix paperclip issue
changed deprecated line for s3 rails.root
added correct version of gem 'aws-sdk, '1.11.1' that still works with nokogiri pre 1.6.0
added amazon bucket
added dev settings
amazon s3 works locally