Merge remote-tracking branch 'upstream/master'
comment and photograph model specs
category model spec
Merge pull request #198 from dklounge/model_spec

Category model specs
Show process logs whilst image is processing
Only show logs if they exist
Merge pull request #200 from robotmay/logging

Show process logs whilst image is processing
Merge remote-tracking branch 'upstream/master'
Update the s3_direct_upload gem

This might resolve issues in Internet Explorer.
Merge pull request #201 from robotmay/update-s3-upload

Update the s3_direct_upload gem
Merge remote-tracking branch 'upstream/master'
Metadata should force strings for title

Some camera models return an array of keywords in a field
we're parsing for the title. This should be ignored if found.
Merge pull request #202 from robotmay/metadata-parsing-bugfix

Metadata should force strings for title