Ensure capistrano CLI options override rake's

rake's implementation of #sort_options was ordering
cap's version of --dry-run first, rake's second.
During option parsing, this meant rake's was added last,
so it overwrote cap's.

This adjustment makes sure capistrano wins these battles.
Merge pull request #1127 from mtwentyman/master

Ensure capistrano CLI options override rake's