more Rakefile, travis changes and added guard