Edited Rakefile.
Tweaks for travis tests.