diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..b3a5c8b0
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
diff --git a/Gemfile b/Gemfile
index fc06556d..9e9ddcc3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'ruby2ruby'
-gem 'ParseTree'
-gem 'httparty'
-gem 'activesupport'
-gem 'method_source'
-gem 'net-ssh'
-gem 'net-ssh'
-gem 'rspec'
-gem 'memcached'
-gem 'el4r'
+gemspec
 
diff --git a/Rakefile b/Rakefile
index c366cb2b..a28677a1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,8 +1,8 @@
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 # Define task
-Spec::Rake::SpecTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 task :default  => :spec
diff --git a/etc/command/xiki_process.rb b/etc/command/xiki_process.rb
index 51820a2e..b2555b17 100644
--- a/etc/command/xiki_process.rb
+++ b/etc/command/xiki_process.rb
@@ -1,12 +1,13 @@
 # Don't hard-code, generate with script? - or use __file path xiki env var!
-require '/projects/xiki/lib/ol'
-require 'core_ext'
+require File.dirname(__FILE__) + '/../../lib/ol'
+require 'active_support/core_ext'
 
 require 'menu'
 
 require 'launcher'
 
-Xiki.init
+# this init is not needed here
+#Xiki.init
 
 # Make named pipes for input and output
 
diff --git a/lib/view.rb b/lib/view.rb
index d5209889..023c82d9 100644
--- a/lib/view.rb
+++ b/lib/view.rb
@@ -1,3 +1,4 @@
+# -*- encoding : iso-8859-1 -*-
 #
 # Represents a division of a window (in emacs terms, it's a window (which is within a frame))
 #
diff --git a/spec/remote_spec.rb b/spec/remote_spec.rb
index 8595a06f..7d35df07 100644
--- a/spec/remote_spec.rb
+++ b/spec/remote_spec.rb
@@ -31,10 +31,10 @@ def self.method_missing(meth, *args, &block); end
   before(:each) do
     $el = mock 'el'
     $el.stub!(:buffer_modified_p).and_return false
-    View = mock 'View'
-    View.stub!(:path).and_return '/tmp/remote_rb/tmp,hey.txt'
-    View.stub!(:file)#.and_return '/tmp/remote_rb/tmp,hey.txt'
-    View.stub!(:beep)#.and_return '/tmp/remote_rb/tmp,hey.txt'
+    view = mock 'View'
+    view.stub!(:path).and_return '/tmp/remote_rb/tmp,hey.txt'
+    view.stub!(:file)#.and_return '/tmp/remote_rb/tmp,hey.txt'
+    view.stub!(:beep)#.and_return '/tmp/remote_rb/tmp,hey.txt'
   end
 
   it "should save remotely" do
diff --git a/xiki.gemspec b/xiki.gemspec
index 76984b49..3966b146 100644
--- a/xiki.gemspec
+++ b/xiki.gemspec
@@ -32,6 +32,18 @@ Gem::Specification.new do |s|
   #     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
   #     s.specification_version = 3
 
-  s.add_development_dependency("rspec", ["~> 2.3.0"])
+  s.add_development_dependency "rspec"
+  s.add_dependency 'ruby2ruby'
+  s.add_dependency 'ParseTree'
+  s.add_dependency 'httparty'
+  s.add_dependency 'activesupport'
+  s.add_dependency 'method_source'
+  s.add_dependency 'net-ssh'
+  s.add_dependency 'net-sftp'
+  s.add_dependency 'memcached'
+  s.add_dependency 'el4r'
+  s.add_dependency 'rake'
+  s.add_dependency 'daemons'
+
 
 end