Move travis install commands to Rakefile and setup CFLAGS env for Travis/RVM.

.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-before_install: git submodule update --init && rake travis:setup && sudo apt-get install subversion
+install: rake travis:install
 script: bundle exec rake spec

Rakefile

@@ -37,7 +37,13 @@ namespace :travis do
     end
   end
 
-  task :setup => [:install_opencflite_debs, :fix_rvm_include_dir]
+  task :install do
+    sh "git submodule update --init"
+    sh "sudo apt-get install subversion"
+    sh "env CFLAGS='-I#{rvm_ruby_dir}/include' bundle install"
+  end
+
+  task :setup => [:install_opencflite_debs, :fix_rvm_include_dir, :install]
 end
 
 namespace :gem do