Update Rakefile to accomodate Travis

Bringing in Andrew's change from the 2-2-stable branch to fix Travis.