Slightly nicer and more robust path reference.
Merge remote-tracking branch 'origin/feature/cleaner-attachment-image-path' into rails-3-develop