fix cache workfile collision between versions
width and height methods for image processing
test case added
added new line that was accidentaly removed
Updated Spanish translations.
Merge pull request #1407 from mitoyarzun/master

Updated Spanish translations.
Travis Ruby 2.1.2
Bump rspec to ~> 2.14.1 and fix some deprecations
Fix Onigmo in readme, closes #1415
Merge pull request #1405 from ShivaVS/master

width and height methods for image processing
Silence rspec 3 complains
Merge pull request #1421 from randoum/master

Silence rspec 3 complains
.all.each is highly inefficient with many rows

According to http://guides.rubyonrails.org/active_record_querying.html, chapter 1.3, you should never use .all.each when iterating over the whole table.
Merge pull request #1438 from prasselpikachu/patch-1

.all.each is highly inefficient with many rows
Merge pull request #1399 from jvdp/versioned-workfile

Fix cache workfile collision between versions
Change image extension when converting formats.
Merge pull request #1446 from nashby/change-file-extension

Change image extension when converting formats.
Make example in README more clear.
Merge pull request #1448 from mlaco/master

Make example in README more clear.
Remove fog version from the README.

closes #1443