Refactor the way role Options and Variables are passed through to Capistrano. Variables will now persist with a role, providing they don't clash with an existing Option on that role.