diff --git a/Gemfile b/Gemfile
index 67a67897..4bf72113 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 
 ruby '1.9.3'
 
-gem 'rails', '3.1.11'
+gem 'rails', '3.2.17'
 gem 'json'
 
 gem 'hackety_hack-lessons', '~> 1.1', :require => 'hackety_hack/lessons'
@@ -16,15 +16,7 @@ gem 'mongo_mapper'
 gem 'bson_ext'
 
 gem "letter_opener", group: :development
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   "~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
-end
-
+  
 gem "devise",     "~> 2.2.2"
 gem 'mm-devise',  '~> 2.0'
 gem 'cancan'
@@ -36,6 +28,14 @@ gem "semantic_menu",  git: "git://github.com/michaek/semantic_menu.git"
 gem 'will_paginate'    # Pagination
 gem 'redcarpet', '~> 3.0'   # Markdown
 
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
+end
+
 group :development do
   # Use unicorn as the web server
   gem 'unicorn'
@@ -49,8 +49,6 @@ group :development, :test do
   gem "faker"
   gem 'pry'
   gem 'sqlite3'
-  
-  
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 098507ce..3d8a7b9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,229 +15,227 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.11)
-      actionpack (= 3.1.11)
-      mail (~> 2.3.3)
-    actionpack (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.11)
-      activesupport (= 3.1.11)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      arel (~> 2.2.3)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-    activesupport (3.1.11)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (2.2.3)
-    bcrypt-ruby (3.0.1)
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
+    addressable (2.3.5)
+    arel (3.0.3)
+    bcrypt-ruby (3.1.2)
+    bson (1.9.2)
+    bson_ext (1.9.2)
+      bson (~> 1.9.2)
     builder (3.0.4)
-    cancan (1.6.7)
-    capybara (1.1.2)
+    cancan (1.6.10)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.0)
-      ffi (~> 1.0.6)
-    coderay (1.0.5)
-    coffee-rails (3.1.1)
+      xpath (~> 2.0)
+    coderay (1.1.0)
+    coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    colorize (0.5.8)
-    coveralls (0.5.8)
-      colorize
-      json
+    coffee-script-source (1.7.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
-    cucumber (1.1.4)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    cucumber-rails (1.4.0)
       capybara (>= 1.1.2)
-      cucumber (>= 1.1.3)
+      cucumber (>= 1.2.0)
       nokogiri (>= 1.5.0)
-    database_cleaner (0.7.1)
-    devise (2.2.2)
+      rails (>= 3.0.0)
+    database_cleaner (1.2.0)
+    devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
-    execjs (1.3.0)
-      multi_json (~> 1.0)
-    fabrication (2.8.1)
-    faker (1.0.1)
-      i18n (~> 0.4)
-    ffi (1.0.11)
-    gherkin (2.7.6)
-      json (>= 1.4.6)
+    execjs (2.0.2)
+    fabrication (2.9.8)
+    faker (1.2.0)
+      i18n (~> 0.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     hackety_hack-lessons (1.1.2)
       metadown
-    haml (3.1.4)
-    haml-rails (0.3.4)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      haml (~> 3.0)
-      railties (~> 3.0)
-    has_scope (0.5.1)
+    haml (4.0.5)
+      tilt
+    haml-rails (0.4)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (>= 3.1, < 4.1)
+      railties (>= 3.1, < 4.1)
+    has_scope (0.6.0.rc)
+      actionpack (>= 3.2, < 5)
+      activesupport (>= 3.2, < 5)
     hike (1.2.3)
-    i18n (0.6.5)
-    inherited_resources (1.3.0)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    json (1.8.0)
-    kgio (2.7.2)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
-    letter_opener (1.0.0)
-      launchy (>= 2.0.4)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
+    i18n (0.6.9)
+    inherited_resources (1.4.1)
+      has_scope (~> 0.6.0.rc)
+      responders (~> 1.0.0.rc)
+    journey (1.0.4)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    kgio (2.9.2)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    letter_opener (1.2.0)
+      launchy (~> 2.2)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
+    metaclass (0.0.3)
     metadown (1.0.1)
       redcarpet
-    method_source (0.7.0)
-    mime-types (1.21)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.5.2)
     mm-devise (2.0)
       devise (>= 1.2)
       mongo_mapper (>= 0.9.0)
-    mocha (0.10.3)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongo_mapper (0.10.1)
+    mongo (1.9.2)
+      bson (~> 1.9.2)
+    mongo_mapper (0.12.0)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
-      plucky (~> 0.4.0)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
-    orm_adapter (0.4.0)
-    pg (0.12.2)
-    plucky (0.4.4)
+      plucky (~> 0.5.2)
+    multi_json (1.8.4)
+    multi_test (0.0.3)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    orm_adapter (0.5.0)
+    pg (0.17.1)
+    plucky (0.5.2)
       mongo (~> 1.5)
-    polyglot (0.3.3)
-    pry (0.9.8)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7)
-      slop (>= 2.4.3, < 3)
-    rack (1.3.10)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.11)
-      actionmailer (= 3.1.11)
-      actionpack (= 3.1.11)
-      activerecord (= 3.1.11)
-      activeresource (= 3.1.11)
-      activesupport (= 3.1.11)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
       bundler (~> 1.0)
-      railties (= 3.1.11)
-    railties (3.1.11)
-      actionpack (= 3.1.11)
-      activesupport (= 3.1.11)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    raindrops (0.8.0)
-    rake (10.1.0)
+      thor (>= 0.14.6, < 2.0)
+    raindrops (0.13.0)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (3.0.0)
-    responders (0.6.5)
+    redcarpet (3.1.1)
+    responders (1.0.0)
+      railties (>= 3.2, < 5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.5)
+    rspec-rails (2.14.1)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rubyzip (0.9.5)
-    sass (3.1.12)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
-    selenium-webdriver (2.17.0)
-      childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
-      rubyzip
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (2.4.4)
-    sprockets (2.0.4)
+    sass (3.2.14)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
-    thor (0.14.6)
-    tilt (1.3.7)
-    treetop (1.4.12)
+    sqlite3 (1.3.8)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    tins (1.0.0)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    uglifier (1.2.2)
+    tzinfo (0.3.38)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    unicorn (4.1.1)
-      kgio (~> 2.4)
+      json (>= 1.8.0)
+    unicorn (4.8.2)
+      kgio (~> 2.6)
       rack
-      raindrops (~> 0.6)
-    warden (1.2.1)
+      raindrops (~> 0.7)
+    warden (1.2.3)
       rack (>= 1.0)
-    will_paginate (3.0.2)
-    xpath (0.1.4)
+    will_paginate (3.0.5)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -247,7 +245,7 @@ DEPENDENCIES
   bson_ext
   cancan
   capybara
-  coffee-rails (~> 3.1.0)
+  coffee-rails
   coveralls
   cucumber-rails
   database_cleaner
@@ -266,10 +264,10 @@ DEPENDENCIES
   mongo_mapper
   pg
   pry
-  rails (= 3.1.11)
+  rails (= 3.2.17)
   redcarpet (~> 3.0)
   rspec-rails
-  sass-rails (~> 3.1.0)
+  sass-rails
   semantic_menu!
   simple_form!
   simplecov
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 383cd89a..bad870f4 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -3,7 +3,7 @@
 %html
   %head
     - title = yield :title
-    %title #{title.blank? ? "" : "#{title} | "}Hackety Hack!
+    %title=(title.blank? ? "" : title.gsub("\n", "")) + " | Hackety Hack!"
 
     <meta name = "viewport" content = "width = device-width">
     / <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css">
diff --git a/features/step_definitions/blog_steps.rb b/features/step_definitions/blog_steps.rb
index 02d8b0e6..a200644e 100644
--- a/features/step_definitions/blog_steps.rb
+++ b/features/step_definitions/blog_steps.rb
@@ -29,8 +29,8 @@
   @post = OpenStruct.new
   @post.title = "A title"
 
-  fill_in :title, :with => "A title"
-  fill_in :content, :with => "Some content"
+  fill_in :blog_post_title, :with => "A title"
+  fill_in :blog_post_content, :with => "Some content"
 end
 
 When /^I press "([^"]*)"$/ do |name|
diff --git a/features/step_definitions/program_steps.rb b/features/step_definitions/program_steps.rb
index 0fd28f2f..619e275c 100644
--- a/features/step_definitions/program_steps.rb
+++ b/features/step_definitions/program_steps.rb
@@ -1,4 +1,4 @@
-Given /^there is a featured program$/ do
+  Given /^there is a featured program$/ do
   @program = Program.create!(:author_username => "username",
                               :slug => "slug",
                               :title => "My Featured Program",
@@ -56,7 +56,7 @@ def visit_user_programs_page
 
 When /^I click the first program link$/ do
   within "#all-programs ul" do
-    find("li:first-child a").click()
+    first("li:first-child a").click()
   end
 end
 
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index a1fea7b0..c3395f59 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -25,7 +25,7 @@ def create_other_user
 end
 
 Then /^it should have the right information$/ do
-  page.should have_selector('title', :content => "#{@user.username}'s page")
+  page.should have_title("#{@user.username}'s Profile\n | Hackety Hack!")
   page.should have_content("#{@user.username}'s Profile")
 end
 
diff --git a/script/bootstrap b/script/bootstrap
index b2daad6e..de77ea4d 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1,4 +1,4 @@
-#!/bin/dash
+#!/bin/bash
 
 go_go_gadget_bootstrap() {
 	check_ruby
diff --git a/spec/helpers/blog_helper_spec.rb b/spec/helpers/blog_helper_spec.rb
deleted file mode 100644
index bef6d821..00000000
--- a/spec/helpers/blog_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the BlogHelper. For example:
-#
-# describe BlogHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe BlogHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/views/questions/index.html.haml_spec.rb b/spec/views/questions/index.html.haml_spec.rb
index 8bcadc85..f371781c 100644
--- a/spec/views/questions/index.html.haml_spec.rb
+++ b/spec/views/questions/index.html.haml_spec.rb
@@ -13,6 +13,7 @@
 
   it "renders an autodiscovery link in for the head content" do
     render :template => "questions/index.html.haml", :locals => {:collection => [question]}
-    view.content_for(:head).should have_selector("link", :href => questions_url(format: :atom))
+    
+    view.content_for(:head).should include(questions_url(format: :atom))
   end
-end
+end
\ No newline at end of file