aws hooked up, waiting on evironment variables
merge
changing local file uploads back to file
configured production.rb for s3