adding empty file to make heroku stop complaining
adding support for actionmailer email account confirmation
before merge
merging master changes to dev
s3 erroring out on missing bucket option
s3 still erroring but if i hard code the bucket name it works