diff --git a/.travis.yml b/.travis.yml
index 3c543d66..b2b62bf9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,6 @@ rvm:
   - 2.1.2
 services:
   - mysql
-branches:
-  only:
-    - master
 notifications:
   email:
     on_success: change
@@ -13,6 +10,8 @@ notifications:
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - 'wget -nv http://sphinxsearch.com/files/dicts/en.pak'
+  - 'sudo apt-get -qq update'
+  - 'sudo apt-get install sphinxsearch'
 before_script:
   - RAILS_ENV=test bundle exec rake dev:bootstrap --trace
 script:
diff --git a/Gemfile.lock b/Gemfile.lock
index 68721322..73d8e4cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,7 +134,7 @@ GEM
       ruby_parser (~> 3.5)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    i18n (0.7.0)
+    i18n (0.8.6)
     innertube (1.1.0)
     joiner (0.3.4)
       activerecord (>= 4.1.0)
@@ -159,7 +159,7 @@ GEM
     mime-types (2.99.3)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     mousetrap-rails (1.4.6)
     multi_json (1.12.1)
     mysql2 (0.3.18)
@@ -230,7 +230,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    riddle (1.5.11)
+    riddle (2.2.0)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -285,19 +285,19 @@ GEM
     stringex (2.7.1)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    thinking-sphinx (3.1.3)
+    thinking-sphinx (3.3.0)
       activerecord (>= 3.1.0)
       builder (>= 2.1.2)
       innertube (>= 1.0.2)
       joiner (>= 0.2.0)
       middleware (>= 0.1.0)
-      riddle (>= 1.5.11)
+      riddle (>= 2.0.0)
     thor (0.19.4)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tilt (2.0.5)
     timecop (0.7.3)
     tins (1.3.5)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
diff --git a/config/database.yml.example b/config/database.yml.example
index b28edca4..65b29e0b 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,8 +1,7 @@
 <%
   if ENV['TRAVIS']
-    username = "travis"
+    password = ''
   else
-    username = "root"
     password = "hackweek"
   end
 %>
@@ -10,7 +9,7 @@
 vagrant: &vagrant
   adapter: mysql2
   encoding: utf8
-  username: <%= username %>
+  username: root
   password: <%= password %>
 
 development:
diff --git a/config/thinking_sphinx.yml b/config/thinking_sphinx.yml
index 541470e9..a1781207 100644
--- a/config/thinking_sphinx.yml
+++ b/config/thinking_sphinx.yml
@@ -1,6 +1,4 @@
 defaults: &defaults
-  morphology:
-    - lemmatize_en_all
   min_infix_len: 3
   mysql41: 9312
   pid_file: sphinx/pids/searchd.pid
@@ -14,4 +12,6 @@ test:
   mysql41: 9313
 production:
   <<: *defaults
+  morphology:
+    - lemmatize_en_all
   configuration_file: "/srv/www/vhosts/suse.com/hackweek/shared/sphinx/config/production.sphinx.conf"
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 3e7c0cbd..5b6cd666 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -51,7 +51,7 @@ namespace :dev do
   end
 
   desc 'bootstrap development environment'
-  task bootstrap: %w(copy_sample_configs bundle_install db:create db:setup db:seed require_searchd ts:regenerate ts:index) do
+  task bootstrap: %w(copy_sample_configs bundle_install db:create db:setup db:seed require_searchd ts:regenerate ts:rebuild) do
     puts "\n\nCongrats! You should be all set.".green
     puts "\nHappy Hacking!".green
   end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 4389e413..3e79944c 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -127,7 +127,7 @@
     end
   end
 
-  describe 'DELETE destroy' do
+  describe 'DELETE destroy', search: true do
     it 'destroys the requested project' do
       project = create(:project)
       expect {
diff --git a/spec/features/project_management_spec.rb b/spec/features/project_management_spec.rb
index fc7096b6..211ed62b 100644
--- a/spec/features/project_management_spec.rb
+++ b/spec/features/project_management_spec.rb
@@ -42,7 +42,7 @@
     expect(page).to have_text(description)
   end
 
-  scenario 'User deletes a project' do
+  scenario 'User deletes a project', search: true do
     project = create(:idea, originator: user)
 
     visit project_path(nil, project)
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 98fed38c..5057f8ff 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -111,7 +111,7 @@
     end
   end
 
-  describe 'destroy' do
+  describe 'destroy', search: true do
     it 'deletes associated comments' do
       project = create :project, :with_comments
       project.destroy!