changed .gitignore again
changed config settings for carrierwave