diff --git a/.gitignore b/.gitignore
index 445beaab..fa176e84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .bundle
 .yardoc
 node_modules
-doc/fdoc-html
 tmp/cache/*
diff --git a/.rspec b/.rspec
index 62c58f04..43ae2036 100644
--- a/.rspec
+++ b/.rspec
@@ -1 +1,3 @@
--cfs
+--color
+--require spec_helper
+--format documentation
diff --git a/.ruby-gemset b/.ruby-gemset
new file mode 100644
index 00000000..0ca3a58d
--- /dev/null
+++ b/.ruby-gemset
@@ -0,0 +1 @@
+squash
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..276cbf9e
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.3.0
diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 27517c2a..00000000
--- a/.rvmrc
+++ /dev/null
@@ -1 +0,0 @@
-rvm 1.9.3@squash --create
diff --git a/Gemfile b/Gemfile
index 66653d80..0fa8cf6e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,80 +1,7 @@
 source 'https://rubygems.org'
 
-ruby "1.9.3"
+# Load all files under the Gemfile.d directory.
 
-# FRAMEWORK
-gem 'rails', git: 'git://github.com/rails/rails.git', branch: '3-2-stable'
-# We need to use this branch of Rails because it includes fixes for ActiveRecord
-# and concurrency that we need for our thread-spawning background job paradigm
-# to work
-gem 'configoro'
-gem 'rack-cors', require: 'rack/cors'
-
-# MODELS
-gem 'pg', platform: :mri
-# Version 1.2.6 introduces a bug relating to SQL binds
-gem 'activerecord-jdbc-adapter', '1.2.5', platform: :jruby
-gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-gem 'has_metadata_column', git: 'git://github.com/RISCfuture/has_metadata_column.git'
-gem 'slugalicious'
-gem 'email_validation'
-gem 'url_validation'
-gem 'json_serialize'
-gem 'validates_timeliness'
-gem 'find_or_create_on_scopes', '>= 1.2.1'
-gem 'composite_primary_keys', git: 'git://github.com/RISCfuture/composite_primary_keys.git'
-gem 'activerecord-postgresql-cursors'
-
-# VIEWS
-gem 'erector'
-gem 'jquery-rails'
-gem 'kramdown'
-
-# UTILITIES
-gem 'json'
-gem 'git', git: 'git://github.com/RISCfuture/ruby-git.git'
-gem 'user-agent'
-
-# AUTH
-gem 'net-ldap', require: 'net/ldap'
-
-# INTEGRATION
-gem 'jira-ruby', require: 'jira'
-
-# DOGFOOD
-gem 'squash_ruby', require: 'squash/ruby'
-gem 'squash_rails', require: 'squash/rails'
-gem 'squash_ios_symbolicator', require: 'squash/symbolicator'
-gem 'squash_javascript', require: 'squash/javascript'
-gem 'squash_java', require: 'squash/java'
-
-group :assets do
-  gem 'sass-rails'
-  gem 'libv8', '~> 3.11.8', platform: :mri
-  gem 'therubyracer', '>= 0.11.1', platform: :mri
-  # Version 2.0 of TheRubyRhino breaks asset compilation
-  gem 'therubyrhino', '< 2.0', platform: :jruby
-  gem 'less-rails'
-
-  gem 'coffee-rails'
-  gem 'uglifier'
-
-  gem 'font-awesome-rails'
-end
-
-group :development do
-  # DOCS
-  gem 'yard', require: nil
-  gem 'redcarpet', require: nil, platform: :mri
-  gem 'fdoc'
+Dir.glob(File.join(File.dirname(__FILE__), 'Gemfile.d', '*.rb')).sort.each do |file|
+  eval File.read(file), binding, file
 end
-
-
-group :test do
-  # SPECS
-  gem 'rspec-rails'
-  gem 'factory_girl_rails'
-  gem 'fakeweb'
-end
-
-gem 'sql_origin', groups: [:development, :test]
diff --git a/Gemfile.d/_before.rb b/Gemfile.d/_before.rb
new file mode 100644
index 00000000..28e26877
--- /dev/null
+++ b/Gemfile.d/_before.rb
@@ -0,0 +1,45 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Load our frozen Configoro
+require File.join(File.dirname(__FILE__), '..', 'vendor', 'configoro', 'simple')
+
+rails_root = ENV['RAILS_ROOT'] || File.join(File.dirname(__FILE__), '..')
+Configoro.paths << File.join(rails_root, 'config', 'environments')
+
+$_squash_environments = Dir.glob(File.join(rails_root, 'config', 'environments', '*.rb')).map { |f| File.basename f, '.rb' }
+
+def load_groups(configuration_path, values)
+  configuration_path = configuration_path.split('.')
+
+  $_squash_environments.select do |env|
+    settings = Configoro.load_environment(env)
+    values.include?(traverse_hash(settings, *configuration_path))
+  end
+end
+
+def traverse_hash(hsh, *keys)
+  return nil unless hsh
+  
+  if keys.size == 1
+    hsh[keys.first]
+  else
+    traverse_hash hsh[keys.shift], *keys
+  end
+end
+
+def conditionally(configuration_path, *values, &block)
+  groups = load_groups(configuration_path, values)
+  groups.each { |g| group g.to_sym, &block }
+end
diff --git a/script/rails b/Gemfile.d/assets.rb
old mode 100755
new mode 100644
similarity index 64%
rename from script/rails
rename to Gemfile.d/assets.rb
index 6469b1c8..4a887aad
--- a/script/rails
+++ b/Gemfile.d/assets.rb
@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
-
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,8 +12,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+gem 'sass-rails'
+gem 'sprockets' # fix nil error
+gem 'libv8', platform: :mri
+gem 'therubyracer', platform: :mri
+gem 'therubyrhino', platform: :jruby
+gem 'less-rails'
+
+gem 'font-awesome-rails'
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'
+gem 'coffee-rails'
+gem 'closure-compiler'
+gem 'jquery-rails'
diff --git a/Gemfile.d/authentication.rb b/Gemfile.d/authentication.rb
new file mode 100644
index 00000000..644fdd92
--- /dev/null
+++ b/Gemfile.d/authentication.rb
@@ -0,0 +1,17 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+conditionally('authentication.strategy', 'ldap') do
+  gem 'net-ldap', github: 'ruby-ldap/ruby-net-ldap', require: 'net/ldap'
+end
diff --git a/Gemfile.d/concurrency.rb b/Gemfile.d/concurrency.rb
new file mode 100644
index 00000000..be2e2a0b
--- /dev/null
+++ b/Gemfile.d/concurrency.rb
@@ -0,0 +1,27 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+conditionally('concurrency.background_runner', 'Resque') do
+  gem 'resque'
+  gem 'resque-pool'
+end
+
+conditionally('concurrency.background_runner', 'Sidekiq') do
+  gem 'sidekiq'
+  gem 'capistrano-sidekiq'
+
+  # disable if you don't need Sidekiq monitoring
+  gem 'slim'
+  gem 'sinatra'
+end
diff --git a/Gemfile.d/development.rb b/Gemfile.d/development.rb
new file mode 100644
index 00000000..d2a7b2c2
--- /dev/null
+++ b/Gemfile.d/development.rb
@@ -0,0 +1,20 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+group :development do
+  gem 'yard', require: nil
+  gem 'redcarpet', require: nil, platform: :mri
+end
+
+gem 'sql_origin', groups: [:development, :test]
diff --git a/Gemfile.d/dogfood.rb b/Gemfile.d/dogfood.rb
new file mode 100644
index 00000000..d128da95
--- /dev/null
+++ b/Gemfile.d/dogfood.rb
@@ -0,0 +1,20 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+gem 'squash_ruby', require: 'squash/ruby'
+gem 'squash_rails', require: 'squash/rails'
+gem 'squash_ios_symbolicator', require: 'squash/symbolicator'
+gem 'squash_javascript', require: 'squash/javascript'
+gem 'sourcemap'
+gem 'squash_java', require: 'squash/java'
diff --git a/Gemfile.d/framework.rb b/Gemfile.d/framework.rb
new file mode 100644
index 00000000..9604117f
--- /dev/null
+++ b/Gemfile.d/framework.rb
@@ -0,0 +1,20 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+gem 'rails', '4.2.5.2'
+gem 'responders'
+gem 'psych' # fix TypeError: superclass mismatch for class Mark
+
+gem 'configoro'
+gem 'rack-cors', require: 'rack/cors'
diff --git a/Gemfile.d/integration.rb b/Gemfile.d/integration.rb
new file mode 100644
index 00000000..5ccfc225
--- /dev/null
+++ b/Gemfile.d/integration.rb
@@ -0,0 +1,17 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+conditionally('jira.disabled', false, nil) do
+  gem 'jira-ruby', require: 'jira'
+end
diff --git a/Gemfile.d/mail.rb b/Gemfile.d/mail.rb
new file mode 100644
index 00000000..c820a8de
--- /dev/null
+++ b/Gemfile.d/mail.rb
@@ -0,0 +1,18 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+conditionally('mailer.smtp_settings.authentication', 'ntlm') do
+  gem 'ruby-ntlm', require: 'ntlm/smtp'
+end
+
diff --git a/Gemfile.d/models.rb b/Gemfile.d/models.rb
new file mode 100644
index 00000000..babce78d
--- /dev/null
+++ b/Gemfile.d/models.rb
@@ -0,0 +1,29 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+gem 'pg', platform: :mri
+gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+gem 'has_metadata_column'
+gem 'slugalicious'
+gem 'email_validation'
+gem 'url_validation'
+gem 'json_serialize'
+gem 'validates_timeliness'
+gem 'find_or_create_on_scopes'
+gem 'composite_primary_keys'
+gem 'rails-observers'
+
+conditionally('activerecord.cursors', true) do
+  gem 'activerecord-postgresql-cursors'
+end
diff --git a/Gemfile.d/specs.rb b/Gemfile.d/specs.rb
new file mode 100644
index 00000000..0d9e465e
--- /dev/null
+++ b/Gemfile.d/specs.rb
@@ -0,0 +1,20 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+group :test do
+  gem 'rspec-rails'
+  gem 'factory_girl_rails'
+
+  gem 'fakeweb'
+end
diff --git a/Gemfile.d/utilities.rb b/Gemfile.d/utilities.rb
new file mode 100644
index 00000000..83a3020d
--- /dev/null
+++ b/Gemfile.d/utilities.rb
@@ -0,0 +1,19 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+gem 'json'
+gem 'git', github: 'RISCfuture/ruby-git'
+gem 'user-agent'
+
+gem 'safe_yaml'
diff --git a/Gemfile.d/views.rb b/Gemfile.d/views.rb
new file mode 100644
index 00000000..46a4abba
--- /dev/null
+++ b/Gemfile.d/views.rb
@@ -0,0 +1,16 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+gem 'erector', github: 'RISCfuture/erector'
+gem 'kramdown'
diff --git a/Gemfile.d/~after.rb b/Gemfile.d/~after.rb
new file mode 100644
index 00000000..e46588b8
--- /dev/null
+++ b/Gemfile.d/~after.rb
@@ -0,0 +1,17 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+if defined?(Configoro)
+  Configoro.reset_paths # reset configoro
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index b2286667..2b221b84 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,199 +1,204 @@
 GIT
-  remote: git://github.com/RISCfuture/composite_primary_keys.git
-  revision: 4f624f3a431b5ad3fa2d80e58b118896c356dffe
+  remote: git://github.com/RISCfuture/erector.git
+  revision: d741e01ba7f16fef30abfa424cc72d2b2b4758e2
   specs:
-    composite_primary_keys (5.0.12)
-      activerecord (~> 3.2.0, >= 3.2.9)
-
-GIT
-  remote: git://github.com/RISCfuture/has_metadata_column.git
-  revision: 2aebf034ab97365cfbf56073c24c3a28fe2dc4ae
-  specs:
-    has_metadata_column (1.0.3)
-      boolean
-      rails (>= 3.0)
+    erector (0.9.0)
+      treetop (>= 1.2.3)
 
 GIT
   remote: git://github.com/RISCfuture/ruby-git.git
-  revision: c4c3e3b9b956918e03c210ff24c0a955e5f13635
+  revision: 88076a50eb70fd96f2417b646fe37fb2f6c4cca4
   specs:
-    git (1.2.5)
-
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 2c8f34995378e4a18711cf5f947e8465227d3748
-  branch: 3-2-stable
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+    git (1.2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activerecord-jdbc-adapter (1.2.5)
-    activerecord-jdbcpostgresql-adapter (1.2.5)
-      activerecord-jdbc-adapter (~> 1.2.5)
-      jdbc-postgres (>= 9.1, < 9.3)
-    activerecord-postgresql-cursors (0.0.2)
-    addressable (2.3.3)
-    arel (3.0.2)
+    actionmailer (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5.2)
+      actionview (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5.2)
+      activesupport (= 4.2.5.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5.2)
+      activesupport (= 4.2.5.2)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5.2)
+      activesupport (= 4.2.5.2)
+      builder (~> 3.1)
+    activerecord (4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      arel (~> 6.0)
+    activesupport (4.2.5.2)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arel (6.0.3)
     boolean (1.0.1)
-    builder (3.0.4)
-    coffee-rails (3.2.2)
+    builder (3.2.2)
+    closure-compiler (1.1.12)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
+      railties (>= 4.0.0, < 5.1.x)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
-    commonjs (0.2.6)
-    configoro (1.1.0)
-      rails (>= 3.0)
-    diff-lcs (1.2.1)
-    email_validation (1.1.1)
+    coffee-script-source (1.10.0)
+    commonjs (0.2.7)
+    composite_primary_keys (8.1.2)
+      activerecord (~> 4.2.0)
+    concurrent-ruby (1.0.1)
+    configoro (1.4.0)
+      activesupport
+    diff-lcs (1.2.5)
+    email_validation (1.2.0)
       localized_each_validator (>= 1.0.1)
-    erector (0.9.0)
-      treetop (>= 1.2.3)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    execjs (2.6.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.6.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     fakeweb (1.3.0)
-    fdoc (0.2.7)
-      json
-      json-schema (>= 1.0.1)
-      kramdown
-    find_or_create_on_scopes (1.3.0)
+    find_or_create_on_scopes (1.4.1)
       activerecord (>= 3.1)
-    font-awesome-rails (3.0.2.0)
-      railties (>= 3.1)
-    hike (1.2.1)
-    httpi (2.0.2)
+    font-awesome-rails (4.5.0.1)
+      railties (>= 3.2, < 5.1)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    has_metadata_column (1.1.5)
+      boolean
+      rails (>= 4.2)
+    httpi (2.4.1)
       rack
-    i18n (0.6.4)
-    jdbc-postgres (9.2.1002.1)
-    jira-ruby (0.1.2)
-      activesupport
-      oauth
-      railties
-    journey (1.0.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
+    i18n (0.7.0)
+    jquery-rails (4.1.0)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    json (1.7.7-java)
-    json-schema (1.1.1)
-    json_serialize (2.2.1)
+    json (1.8.3)
+    json_serialize (2.2.2)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-    kramdown (1.0.1)
-    less (2.3.1)
-      commonjs (~> 0.2.6)
-    less-rails (2.3.2)
-      actionpack (>= 3.1)
-      less (~> 2.3.1)
-    libv8 (3.11.8.13)
-    localized_each_validator (1.0.1)
-      activerecord (>= 3.0)
+    kramdown (1.9.0)
+    less (2.6.0)
+      commonjs (~> 0.2.7)
+    less-rails (2.7.1)
+      actionpack (>= 4.0)
+      less (~> 2.6.0)
+      sprockets (> 2, < 4)
+      tilt
+    libv8 (3.16.14.13)
+    localized_each_validator (1.0.3)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.21)
-    multi_json (1.7.1)
-    net-ldap (0.3.1)
-    oauth (0.4.7)
-    pg (0.14.1)
-    plist (3.1.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-cors (0.2.7)
-      rack
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.99.1)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    pg (0.18.4)
+    plist (3.2.0)
+    polyglot (0.3.5)
+    psych (2.0.17)
+    rack (1.6.4)
+    rack-cors (0.4.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (2.2.2)
-    ref (1.0.4)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    sass (3.2.7)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
+    rails (4.2.5.2)
+      actionmailer (= 4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activerecord (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.5.2)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    railties (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.5.0)
+    redcarpet (3.3.4)
+    ref (2.0.0)
+    responders (2.1.1)
+      railties (>= 4.2.0, < 5.1)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    safe_yaml (1.0.4)
+    sass (3.4.21)
+    sass-rails (5.0.4)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     serialbox (1.0.0)
       activesupport
       json
-    slugalicious (2.0.0)
-      rails (>= 3.1)
+    slugalicious (2.1.0)
+      rails (>= 4.0)
       stringex
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sql_origin (1.0.2)
-      rails (~> 3.2)
+    sourcemap (0.1.1)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.3)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sql_origin (1.1.2)
+      rails (>= 4.0)
     squash_ios_symbolicator (1.1.1)
       plist
       serialbox
@@ -201,86 +206,89 @@ GEM
     squash_java (1.0.3)
       json
       squash_uploader (>= 1.0.1)
-    squash_javascript (1.0.2)
+    squash_javascript (2.0.9)
+      coffee-rails
       json
       railties (>= 3.1)
+      sourcemap
+      sprockets-rails (>= 3.0)
       squash_uploader
-    squash_rails (1.1.0)
+    squash_rails (1.3.4)
       squash_ruby
-    squash_ruby (1.1.1)
+    squash_ruby (2.0.0)
       json
     squash_uploader (1.0.1)
       json
-    stringex (1.5.1)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+    stringex (2.6.0)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
       ref
-    therubyrhino (1.73.5)
-    thor (0.17.0)
-    tilt (1.3.6)
-    timeliness (0.3.7)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    url_validation (1.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.2)
+    timeliness (0.3.8)
+    treetop (1.6.5)
+      polyglot (~> 0.3)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    url_validation (1.1.0)
       activerecord
       activesupport
       addressable
       httpi
     user-agent (1.0.0)
-    validates_timeliness (3.0.14)
-      timeliness (~> 0.3.6)
-    yard (0.8.5.2)
+    validates_timeliness (4.0.2)
+      timeliness (~> 0.3.7)
+    yard (0.8.7.6)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord-jdbc-adapter (= 1.2.5)
   activerecord-jdbcpostgresql-adapter
-  activerecord-postgresql-cursors
+  closure-compiler
   coffee-rails
-  composite_primary_keys!
+  composite_primary_keys
   configoro
   email_validation
-  erector
+  erector!
   factory_girl_rails
   fakeweb
-  fdoc
-  find_or_create_on_scopes (>= 1.2.1)
+  find_or_create_on_scopes
   font-awesome-rails
   git!
-  has_metadata_column!
-  jira-ruby
+  has_metadata_column
   jquery-rails
   json
   json_serialize
   kramdown
   less-rails
-  libv8 (~> 3.11.8)
-  net-ldap
+  libv8
   pg
+  psych
   rack-cors
-  rails!
+  rails (= 4.2.5.2)
+  rails-observers
   redcarpet
+  responders
   rspec-rails
+  safe_yaml
   sass-rails
   slugalicious
+  sourcemap
+  sprockets
   sql_origin
   squash_ios_symbolicator
   squash_java
   squash_javascript
   squash_rails
   squash_ruby
-  therubyracer (>= 0.11.1)
-  therubyrhino (< 2.0)
-  uglifier
+  therubyracer
+  therubyrhino
   url_validation
   user-agent
   validates_timeliness
   yard
+
+BUNDLED WITH
+   1.11.2
diff --git a/LICENSE.txt b/LICENSE.txt
index 6e5be056..e18b191e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2012 Square Inc.
+   Copyright 2014 Square Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
deleted file mode 120000
index 1df17956..00000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-doc/README_FOR_APP.md
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..43c0191b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,466 @@
+Squash: A squarish bug spray
+============================
+
+**An open-source project from [Square](http://github.com/square)**
+
+Squash is a collection of tools that help engineers find and kill bugs in their
+code by automatically collecting, collating and analyzing run time exceptions.
+Squash consists of the following components:
+
+* **Client libraries:** Client libraries for different systems (Ruby, Ruby on
+  Rails, Cocoa with Objective-C, etc.) catch and record errors when they occur,
+  then send them to the API endpoint. Client libraries can be found under the
+  [SquareSquash organization](https://github.com/SquareSquash).
+* **Front-end:** This website displays Bug information and helps the engineer
+  find the root cause for a Bug, and fix it. It also lets engineers manage,
+  assign, and comment on Bugs, as well as view statistics about the Bug.
+* **API endpoints:** These routes (part of the front-end app) receive exception
+  notifications from the client libraries and process them.
+
+This project is the front-end and the API.
+
+Pull requests are more than welcome; please check out
+[CONTRIBUTING.md](file.CONTRIBUTING.html) for details.
+
+How to Install
+--------------
+
+To get started, run the `bin/setup` file. This script will ask you a series of 
+questions and generate a preliminary configuration for your site install. When 
+the script is completed, you can run `git status` to see what files it changed, 
+and refine your configuration from there.
+
+Once the script is complete, Squash should run for most typical development
+environments. Simply run `rails s` and visit the site in your Web browser. You
+should be able to start using it immediately. You can also verify correctness by
+running `rspec spec`.
+
+Configuring and deploying the production instance is entirely up to you and your
+particular production environment.
+
+Additional configuration options can be found in the following locations:
+
+* `config/application.rb`
+* `config/environments/*.rb`
+* `config/environments/*/*.yml`
+
+If you don't see what you're looking for in any of those files, you'll probably
+have to change the code to make it work. Don't be afraid -- the code is
+thoroughly documented and should (hopefully) be very accessible.
+
+### Requirements
+
+Squash requires the following:
+
+* Ruby 1.9.2 or newer (JRuby with `--1.9` is supported)
+* Multithreading support (see the next section)
+* PostgreSQL 9.1 or newer
+* The Bundler gem
+* Git 1.7 or newer
+
+### Notes on some of the gem and library choices
+
+**Why do you specifically require PostgreSQL?** Squash uses a lot of
+PostgreSQL-specific features to make efficient use of the database and maintain
+referential integrity, such as:
+
+* foreign key constraints,
+* triggered cached counters,
+* check constraints, and
+* semantic indexes for text-based search.
+
+If PostgreSQL is out of the question, some of these features can be ported to
+other RDBMSes; simply edit the `InitialSchema` migration and update the SQL as
+necessary. If portability is required, a lot of these features can be
+reimplemented in the Rails layer (e.g., cached counters), at the risk of
+degraded referential integrity. (If you are reimplementing the cached counters
+in Ruby, be sure to modify the `config/initializers/active_record.rb` file as
+appropriate.)
+
+If you do successfully port Squash to another RDBMS, let me know. I'd be happy
+to take your changes.
+
+**Why do you bundle an edge version of Rails?** The `3-2-stable` branch of Ruby
+on Rails includes some changes to Active Record that are required by Squash's
+multithreaded concurrency model (see next question). In particular, that version
+of Active Record includes crucial changes to the connection pool and connection
+reopening logic. If you set the `background_runner` option in the
+`concurrency.yml` file to something other than `Multithread`, the Gemfile will
+automatically drop Rails back down to the latest release version.
+
+**Why don't you use my favorite backgrounding library?** Squash was originally
+built for Square, which runs all its services on JRuby. Using threads is very
+efficient in JRuby, and avoids the overhead of having to deploy both a website
+and workers.
+
+If you are running Squash in a non-thread-safe (or multithreading-unfriendly)
+environment, you can use Sidekiq or Resque instead. If you want to use some
+other backgrounding library, you can easily write your own adapter. All threaded
+code is invoked using {BackgroundRunner.run}, which then uses the settings in
+the `concurrency.yml` Configoro file to invoke the correct module under
+`lib/background_runner`. The default is to use {BackgroundRunner::Multithread},
+which uses the {Multithread} module to execute the task in its own thread. You
+can edit the YAML file and switch the background runner to Resque, or implement
+your own `BackgroundRunner` module. See the {BackgroundRunner} documentation for
+more details.
+
+If you do this successfully and wish to save future Squash users the effort,
+feel free to turn your changes into a pull request.
+
+**Why aren't you using RedCarpet?** As mentioned above, Squash was originally
+built to run under JRuby. RedCarpet has compiled C extensions; Kramdown is pure
+Ruby.
+
+**Why do you require a recent version of Git?** Squash uses the
+`git clone --mirror` command to create local mirrors of client projects' Git
+repositories.
+
+**Why don't you have integration tests or acceptance tests?** To be 100% honest,
+lack of familiarity on these things in Ruby/Rails. Happy for any help people
+want to extend towards this goal.
+
+**Why are you using Erector?** I like Erector.
+
+Documentation
+-------------
+
+Comprehensive documentation is written in YARD- and Markdown-formatted comments
+throughout the source. To view this documentation as an HTML site, run
+`rake yard`.
+
+CoffeeScript libraries are documented using the YARD format as well, but YARD
+does not as yet recognize them as documentable files. A `.codoopts` file is
+included in case you wish to use [Codo](https://github.com/netzpirat/codo) to
+generate the CoffeeScript docs, but as of now Codo does not recognize the ERb
+files, and does not use the full set of Markdown syntax features used in the
+documentation.
+
+Project Overview
+----------------
+
+### Views
+
+This is a pretty typical Rails website, save for the views, which are written
+using Erector. The views forgo the traditional Rails concepts of partials and
+templates in favor of analogous OOP concepts more familiar to software
+developers: methods and inheritance. All views inherit from an abstract Erector
+widget which provides layout; and all views have their content split into
+multiple private methods.
+
+In addition to the usual helpers (in `app/helpers`), there are view mixins under
+`app/views/additions` that simplify view coding.
+
+Embedded code snippets are all rendered using the {CommitsController#context}
+action. This action loads the appropriate file and revision from the Git
+repository and returns a snippet plus the name of the SyntaxHighlighter brush to
+use. The brush is determined from the file name/extension; the mapping can be
+found in `data/brushes.yml`.
+
+This view behavior is provided from a JavaScript library file in
+`lib/assets/javascripts`. There are many similar helper classes in there; they
+are documented but the documentation is not recognized by YARD and so is not
+included in this documentation set.
+
+JavaScript files are organized into four possible locations:
+
+* Third-party JavaScript libraries are in `vendor/assets/javascripts` and
+  loaded in the `application.js` manifest.
+* JavaScript modules or helpers that are not specific to a particular page or
+  site area are in `lib/assets/javascripts` and also loaded in `application.js`.
+* JavaScript modules or helpers specific to a particular area of the site are in
+  `app/assets/javascripts` and also loaded in `application.js`.
+* Small JavaScript snippets, glue code, or other code intended to add dynamic
+  behavior to a specific page is in a `.js` file named the same as, and placed
+  alongside, the `.html.rb` view file. For example, if
+  `app/views/projects/new.html.rb` needed a bit of JS glue code, it would be
+  placed in `app/views/projects/new.js`. This code is placed in a `<SCRIPT>` tag
+  at the end of the view by the {Views::Layouts::Application#inline_javascript}
+  method.
+
+CSS files are similarly organized:
+
+* Third-party CSS files are in `vendor/assets/stylesheets` and loaded in the
+   `application.css` manifest.
+* CSS styles or helpers global to the entire website are in
+  `lib/assets/stylesheets` and also loaded in `application.css`.
+* CSS styles specific to a single page or a related group of pages are placed in
+  `app/assets/stylesheets` and also loaded in `application.css`. Each `<BODY>`
+  tag is given a class name equal to the controller name, and an ID equal to
+  the controller and action name separated with a dash. For instance, the
+  `projects/new` action's body would be `<body class=projects id=projects-new>`.
+
+### Controllers
+
+For information about requests and responses, see {ApplicationController}.
+
+### Models
+
+Models make extensive use of advanced PostgreSQL features for efficiency and
+convenience. Cached counters are updated using triggers and rules, foreign key
+constraints and hooks are enforced at the database level, and validations are
+backed up by corresponding `CHECK` triggers. This helps ensure referential and
+data integrity even in situations where Rails fails, or outside of the Rails
+stack. See the various migrations to learn more about the triggers, rules, and
+constraints being used.
+
+Observers are used for more high-level triggers, such as creating {Event Events}
+at the appropriate times, or sending emails. See the classes in
+`app/models/observers` for more.
+
+Models also use the HasMetadataColumn gem to reduce their width and incorporate
+schemaless data. Most models have a JSON-formatted `metadata` column to which
+new information can be added or removed without having to create new migrations.
+
+### Tasks
+
+Various Rake tasks are available under `lib/tasks`. These include tasks for
+pruning and maintaining the database, development tasks, and configuring the
+workers.
+
+### Workers
+
+Workers are found in the `lib/workers` directory. Along with OccurrencesWorker,
+which stores and categorizes Occurrences, there are other workers for managing
+Deploys and other minor tasks. These workers are run asynchronously using
+{Multithread}.
+
+### Mailers
+
+Notification mails are sent by the {NotificationMailer}. It and any other
+mailers live in `app/mailers`.
+
+`NotificationMailer` conditionally delivers emails. An email will only be
+delivered if all of the following conditions are met:
+
+* The Project has a mailing list email configured (for the critical-bugs and
+  all-bugs mailing lists),
+* the Environment's `sends_emails` attribute is `true`, and
+* the User has enabled receipt of that category of emails (typically specified
+  in the Membership).
+
+### Authentication and Authorization
+
+Authentication is done using either password verification or LDAP; see
+{AuthenticationHelpers} and related controller mixins, as well as the
+model mixins under `app/models/additions` for more information.
+
+There are four permissions levels that a User can have, specific to an
+individual Project:
+
+**Non-members** do not have a {Membership} record with a Project. They can view
+Bugs and Occurrences, view the Project's API key, view the list of other
+Project members, watch Bugs, and comment on Bugs.
+
+**Members** can do everything non-members can do, and can also assign Bugs, be
+assigned Bugs, and modify/delete Bugs.
+
+**Administrators** can do everything members can do, and can also modify
+Project and Environment settings, regenerate the API key, promote and demote
+members to administrator status, and modify/delete others' Comments.
+
+**Owners** (each Project has only one) can do everything administrators can do,
+and can also delete the Project and reassign ownership.
+
+Recording and Categorizing Occurrences
+--------------------------------------
+
+### Client-Specific Information
+
+The client library identifiers used throughout the website determine how a Bug
+reported from that library is presented in the view. The
+{OccurrencesController::INDEX_FIELDS} constant maps a client library identifier
+to the relevant summary fields to display in the list view.
+
+Each occurrence is transmitted with the name of the client library; the
+{Occurrence} records this to the `client` field. The {Bug}'s `client` field is
+set from the first Occurrence's; in general, one should expect that all
+Occurrences of a Bug share the same client value.
+
+Regardless of the Occurrence's client value, all fields for which there is data
+are displayed in the Occurrence view.
+
+If a client library is updated to add new information fields, all that is needed
+is to update the `has_metadata` hash in Occurrence with the new fields, and to
+update the `occurrences#show` view as necessary. (The `INDEX_FIELDS` hash can
+also be updated as appropriate.)
+
+If a new client library is added, in addition to doing the above for any new
+fields unique to the new client, the `INDEX_FIELDS` hash will need to be
+expanded to include the new client.
+
+### Queue Consumer
+
+For information about the background worker that converts incoming exception
+information into Occurrence and Bug records (including doing "best guess" commit
+blaming, determining which Occurrences share the same root Bug, etc.), see the
+documentation for the {OccurrencesWorker} module. See also **Static Analysis**
+below.
+
+### Deploys and Releases
+
+Squash can handle both _deployed_ projects (hosted projects for which typically
+only one version is live at a time) and _released_ projects (distributed apps
+for which many versions may exist "in the wild").
+
+If you are developing a released project, you must associate your {Deploy}
+objects with a unique version identifier (such as a build number). You must also
+send the correct build identifier with every occurrence report. See the client
+library and API controller documentation for more information.
+
+Once this is done, Squash's behavior is changed slightly: Bugs that are fixed
+in an older release, but recur, are not reopened. Bugs that are fixed in an
+older release but then recur in newer releases are treated as completely
+separate Bugs.
+
+This app exposes an API endpoint for notifying Squash of new releases/deploys of
+your Project. You should notify Squash whenever you deploy your Project (or
+release a new version) so that it can properly manage Bugs (automatically mark
+fixed Bugs as deployed, associate new Bugs with the new Deploy, etc.).
+
+Most client libraries include an easy means to add this feature to your deploy
+or release process.
+
+Static Analysis
+---------------
+
+### Message Normalization
+
+When an Occurrence is grouped into a Bug, its message is stripped of any
+non-relevant or situational information. (Note that since the message is not
+used as a dimension in grouping Occurrences, two Occurrences of the same Bug
+could have completely different messages. A Bug gets its message from its first
+Occurrence.) This is done by subclasses of {Blamer::Base}.
+
+For most messages, this is done using simple regex subsitution. Squash can also
+normalize an exception's message using a list of known message templates. Such
+templates are stored in the `data/message_templates.yml` file. The file contains
+a hash mapping exception class names to an array of arrays. Each inner array
+contains two elements: the regexp to match the exception message on, and the
+replacement message should it match.
+
+These templates are evaluated in the order they appear in the array. Scripts
+that regenerate the templates for MySQL and PostgreSQL error strings can be
+found under the `script` directory.
+
+### Version Control Systems
+
+As of now, Squash is only compatible with projects that are version-controlled
+using Git. However, in the interest of remaining as VCS-agnostic as possible,
+commit identifiers are never called "SHA1s," but instead "IDs."
+
+### Unsymbolicated, Obfuscated, or Minified Stack Traces
+
+Client libraries of compiled, obfuscated, or minified applications will need to
+convert their stack traces in order for them to be of use for static analysis.
+Because release builds are typically not distributed with embedded decompilation
+information, a mapping or table must be given to Squash, so that when Squash
+receives an unconverted stack trace, it can perform lookups and convert it to a
+more usable format.
+
+Currently, the supported conversions are:
+
+* symbolication of iOS exceptions (see {Symbolication}),
+* deobfuscation of Java exceptions (see {ObfuscationMap}),
+* and source-mapping of JavaScript exceptions (see {SourceMap}).
+
+Client libraries are responsible for delivering the raw stack trace data to
+Squash when an exception occurs, and for delivering lookup tables to Squash upon
+each new release. {Api::V1Controller} has endpoints for these purposes in
+various languages.
+
+Unconverted stack traces are stored in a particular format; see {Occurrence} for
+more information. When a new exception with a stack trace in this format is
+received, Squash immediately attempts to convert it using an existing matching
+lookup table. If no such table is found, the stack trace is left unconverted. It
+can still be viewed on the front end. When, later, a new lookup table is added,
+Squash automatically finds and converts any matching stack traces.
+
+Because every new Occurrence must be assigned a Bug (including unconverted
+Occurrences), it is possible that the "blamed" `file` and `line` fields of the
+Bug could themselves be unconverted. The {Bug} class has provisions to support
+this; see in particular `bugs.special_file`.
+
+Specs
+-----
+
+All models, controllers, and library files are unit-tested with RSpec specs
+under the `spec` directory. Run unit tests with the `rspec spec` command. Views
+and JavaScript files are not specced. No integration or acceptance tests are
+written. Almost all unit tests use factories rather than mocks, putting them
+somewhat closer to integration tests.
+
+In general, the test environment is identical to the development/production
+environment, save for the usual Rails allowances, and the
+`config/initializers/active_record_observer_hooks.rb` file. This file adds
+after-commit hooks to observers (identical to those available to models).
+However, specs are transactionalized, meaning that these hooks wouldn't run
+until after the spec is completed, resulting in multiple spec failures.
+
+To remedy this, the file introspects on the environment, and instead links the
+observer hooks to the `after_save` model hooks in the test environment. This
+differentiates the test and live environments, but allows specs to pass.
+
+If you wish to bring your test environment closer to production, you can set
+the `use_transactional_fixtures` RSpec setting to false. The hooks file will
+automatically detect the change and use the correct `after_commit` hooks.
+Currently, all specs pass with and without transactionalized fixtures.
+
+Third-Party Integrations
+------------------------
+
+Squash supports integration with a handful of popular other developer tools.
+
+### PagerDuty
+
+When Squash is integrated with PagerDuty, it will begin sending exceptions to
+PagerDuty once the Occurrence count for a given Bug exceeds the Project's
+critical threshold. Thereafter, every Occurrence is sent to PagerDuty as a
+trigger. The triggers are grouped into alerts by Bug, so users will only be
+paged once per new error.
+
+In addition, marking a Bug fixed will also automatically resolve its associated
+PagerDuty alert (if any), and assigning a Bug or marking it irrelevant
+automatically acknowledges any associated PagerDuty alert.
+
+In order to integrate Squash with PagerDuty, you must
+
+1. generate an API key that Squash can use for PagerDuty access (you must be a
+   PagerDuty admin to do this),
+2. update the `config/environments/common/pagerduty.yml` file to enable
+   PagerDuty integration and provide the API key,
+3. configure Generic API services for each escalation policy you wish to use,
+   and
+4. set the PagerDuty-related options in your Project's configuration page.
+
+### JIRA
+
+When Squash is integrated with JIRA, users have the option of associating a JIRA
+issue with any Bug. The Management tab will then display a link allowing the
+user to quickly view the associated issue.
+
+In addition, the user can have Squash watch the JIRA issue for status updates.
+Once the JIRA issue is resolved (or is changed to someother specified status),
+the Bug can be automatically marked as fixed. By associating multiple Bugs with
+one JIRA issue in such a manner, a user can quickly fix a large number of Bugs
+by closing just one JIRA issue.
+
+Finally, a "Create JIRA Issue" button is provided on the Management tab allowing
+users to easily create new JIRA issues for any Bug.
+
+In order to integrate Squash with JIRA, you must
+
+1. configure the `config/environments/common/jira.yml` file with your
+   JIRA authentication credentials and installation location, and
+2. add a cron job or other periodic task that runs `rake jira:update`.
+
+JIRA integration works out-of-the-box if you use username/password
+authentication. OAuth authentication requires a few more steps. Because OAuth
+authentication requires user actions, you will need to obtain an access token
+and secret which the JIRA client can use without needing to prompt the user. You
+can do this by running the `jira_oauth.rb` script:
+
+```` ruby
+rails runner script/jira_oauth.rb
+````
+
+Follow the instructions to set up your JIRA integration.
diff --git a/Rakefile b/Rakefile
index 68ee3a83..4e764951 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/assets/javascripts/aggregation.js.coffee b/app/assets/javascripts/aggregation.js.coffee
index 16f6b230..2ab14ed2 100644
--- a/app/assets/javascripts/aggregation.js.coffee
+++ b/app/assets/javascripts/aggregation.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7bf83338..2e0a5f13 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 
-// This is a manifest file that'll be compiled into application.js, which will include all the files
+// This is a manifest file that'll be compiled into application, which will include all the files
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
@@ -26,7 +26,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
 //
 //= require jquery-cookie
 //= require jquery-leanModal
@@ -37,7 +36,38 @@
 //= require flot/stack
 //= require flot/time
 //
-//= require sh/manifest
+//= require sh/shCore
+//= require sh/shBrushAppleScript
+//= require sh/shBrushAS3
+//= require sh/shBrushBash
+//= require sh/shBrushColdFusion
+//= require sh/shBrushCpp
+//= require sh/shBrushCSharp
+//= require sh/shBrushCss
+//= require sh/shBrushDelphi
+//= require sh/shBrushDiff
+//= require sh/shBrushErlang
+//= require sh/shBrushGit
+//= require sh/shBrushGroovy
+//= require sh/shBrushHaxe
+//= require sh/shBrushJava
+//= require sh/shBrushJavaFX
+//= require sh/shBrushJScript
+//= require sh/shBrushObjC
+//= require sh/shBrushPerl
+//= require sh/shBrushPhp
+//= require sh/shBrushPlain
+//= require sh/shBrushPowerShell
+//= require sh/shBrushPython
+//= require sh/shBrushRuby
+//= require sh/shBrushSass
+//= require sh/shBrushScala
+//= require sh/shBrushSql
+//= require sh/shBrushTAP
+//= require sh/shBrushTypeScript
+//= require sh/shBrushVb
+//= require sh/shBrushXml
+//= require sh/shBrushYaml
 //
 //= require bootstrap
 //
diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee
index 93d784c8..26ef2197 100644
--- a/app/assets/javascripts/flash.js.coffee
+++ b/app/assets/javascripts/flash.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@ class root.Flash
     @close.click => this.remove()
 
     switch @type
-      when 'alert'   then $('<i/>').addClass('icon-exclamation-sign').prependTo(@element)
-      when 'success' then $('<i/>').addClass('icon-ok-sign').prependTo(@element)
-      when 'notice'  then $('<i/>').addClass('icon-info-sign').prependTo(@element)
+      when 'alert'   then $('<i/>').addClass('fa fa-exclamation-circle').prependTo(@element)
+      when 'success' then $('<i/>').addClass('fa fa-check-circle').prependTo(@element)
+      when 'notice'  then $('<i/>').addClass('fa fa-info-circle').prependTo(@element)
 
     @element.oneTime 500, => @element.addClass 'flash-shown'
     @element.oneTime(5000, => this.remove()) if @type == 'success'
@@ -55,4 +55,3 @@ class root.Flash
     @close.remove()
     @element.addClass('flash-hidden')
     @element.oneTime 1000, => @element.remove()
-    delete this
diff --git a/app/assets/javascripts/histogram.js.coffee b/app/assets/javascripts/histogram.js.coffee
index 2029d6dc..ca33b61e 100644
--- a/app/assets/javascripts/histogram.js.coffee
+++ b/app/assets/javascripts/histogram.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/assets/javascripts/navbar.js.coffee b/app/assets/javascripts/navbar.js.coffee
index 4e5d48b8..9bffae81 100644
--- a/app/assets/javascripts/navbar.js.coffee
+++ b/app/assets/javascripts/navbar.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/assets/javascripts/search.js.coffee b/app/assets/javascripts/search.js.coffee
index e68a1086..92a08f6e 100644
--- a/app/assets/javascripts/search.js.coffee
+++ b/app/assets/javascripts/search.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/assets/stylesheets/_controls.scss b/app/assets/stylesheets/_controls.scss
index 9693e2af..90acbadc 100644
--- a/app/assets/stylesheets/_controls.scss
+++ b/app/assets/stylesheets/_controls.scss
@@ -60,4 +60,4 @@ input.error, select.error, textarea.error {
   background-color: $red !important;
 }
 
-*:invalid { border: 1px solid $red !important; }
+input:invalid, textarea:invalid, select:invalid { border: 1px solid $red !important; }
diff --git a/app/assets/stylesheets/feed.css.scss b/app/assets/stylesheets/feed.css.scss
index a8160cf5..73d6399e 100644
--- a/app/assets/stylesheets/feed.css.scss
+++ b/app/assets/stylesheets/feed.css.scss
@@ -66,13 +66,13 @@ ul#events {
 
   // colors for feed icons
 
-  i.icon-exclamation-sign { color: #880000; } // occur
-  i.icon-warning-sign { color: #dc143c; }     // reopen
-  i.icon-truck { color: #8b4513; }            // deploy
-  i.icon-user { color: #2f4f4f; }             // assign
-  i.icon-ok-sign { color: #008200; }          // fixed
-  i.icon-remove-sign { color: #6495ed; }      // unimportant
-  i.icon-comment { color: #483d8b; }          // comment
-  i.icon-copy { color: #7f007f; }             // dupe
-  i.icon-envelope { color: #555555; }         // email
+  i.fa-exclamation-circle { color: #880000; }   // occur
+  i.fa-exclamation-triangle { color: #dc143c; } // reopen
+  i.fa-truck { color: #8b4513; }                // deploy
+  i.fa-user { color: #2f4f4f; }                 // assign
+  i.fa-check-circle { color: #008200; }         // fixed
+  i.fa-times-circle { color: #6495ed; }         // unimportant
+  i.fa-comment { color: #483d8b; }              // comment
+  i.fa-files-o { color: #7f007f; }              // dupe
+  i.fa-envelope-o { color: #555555; }           // email
 }
diff --git a/app/assets/stylesheets/flash.css.scss b/app/assets/stylesheets/flash.css.scss
index c65b88f6..6af5f077 100644
--- a/app/assets/stylesheets/flash.css.scss
+++ b/app/assets/stylesheets/flash.css.scss
@@ -20,7 +20,7 @@
   position: relative;
   left: -100%;
 
-  [class^="icon-"], [class*=" icon-"] { margin-right: 10px; }
+  [class^="fa-"], [class*=" fa-"] { margin-right: 10px; }
   a {
     float: right;
     font-weight: bold;
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 4c144aa9..641da74f 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -32,7 +32,7 @@ body#projects-index {
     &>p { margin-bottom: 20px; }
   }
 
-  a.icon-star { text-decoration: none; }
+  a.fa-star, a.fa-star-o { text-decoration: none; }
 }
 
 body#projects-show {
diff --git a/app/assets/stylesheets/squash.css.scss b/app/assets/stylesheets/squash.css.scss
index 4c98ce8e..caefffe5 100644
--- a/app/assets/stylesheets/squash.css.scss
+++ b/app/assets/stylesheets/squash.css.scss
@@ -60,4 +60,4 @@ img {
 @import "modal";
 @import "navbar";
 @import "pills";
-@import "footer";
+@import "footer.scss";
diff --git a/app/controllers/account/bugs_controller.rb b/app/controllers/account/bugs_controller.rb
index 98a0748d..19eb8c1a 100644
--- a/app/controllers/account/bugs_controller.rb
+++ b/app/controllers/account/bugs_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ class Account::BugsController < ApplicationController
   # | `last` | The ID (`type` is `watched`) or number (`type` is not `watched`) of the last Bug of the previous page; used to determine the start of the next page (optional). |
 
   def index
-    if params[:type].try(:downcase) == 'watched'
+    if params[:type].try!(:downcase) == 'watched'
       watches = current_user.watches.order('created_at DESC').includes(bug: [{environment: :project}, :assigned_user]).limit(PER_PAGE)
       last = params[:last].present? ? current_user.watches.joins(:bug).where(bug_id: params[:last]).first : nil
       watches = watches.where(infinite_scroll_clause('created_at', 'DESC', last, 'watches.bug_id')) if last
diff --git a/app/controllers/account/events_controller.rb b/app/controllers/account/events_controller.rb
index a7c4b29f..09bcb7ad 100644
--- a/app/controllers/account/events_controller.rb
+++ b/app/controllers/account/events_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ def index
     last      = params[:last].present? ? current_user.user_events.find_by_event_id(params[:last]) : nil
     event_ids = event_ids.where(infinite_scroll_clause('created_at', 'DESC', last, 'event_id')) if last
     @events = Event.where(id: event_ids.pluck(:event_id)).order('created_at DESC').includes({user: :emails}, bug: {environment: {project: :slugs}})
-    Event.preload @events.all
+    Event.preload @events.to_a
 
     respond_with decorate(@events)
   end
diff --git a/app/controllers/account/memberships_controller.rb b/app/controllers/account/memberships_controller.rb
index 3799ae50..0a085770 100644
--- a/app/controllers/account/memberships_controller.rb
+++ b/app/controllers/account/memberships_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 63fbff0a..fd4caa4e 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ def show
   # Routes
   # ------
   #
-  # * `PUT /account`
+  # * `PATCH /account`
   #
   # Body Parameters
   # ---------------
@@ -48,7 +48,7 @@ def update
       params[:user].delete 'password_confirmation'
     end
 
-    current_user.update_attributes params[:user], as: :user
+    current_user.update_attributes user_params
     respond_with current_user do |format|
       format.html do
         if current_user.valid?
@@ -60,4 +60,11 @@ def update
       end
     end
   end if Squash::Configuration.authentication.strategy == 'password'
+
+  private
+
+  def user_params
+    params.require(:user).permit(:username, :password, :password_confirmation,
+                                 :email_address, :first_name, :last_name)
+  end
 end
diff --git a/app/controllers/additions/authentication_helpers.rb b/app/controllers/additions/authentication_helpers.rb
index 0750b6cc..d2999ab5 100644
--- a/app/controllers/additions/authentication_helpers.rb
+++ b/app/controllers/additions/authentication_helpers.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #
 # All public and protected methods are available to all controllers. The
 # following methods are also available to all views: {#current_user},
-# {#logged_in?}, {#logged_out?}, and {#admin_logged_in?}.
+# {#logged_in?}, and {#logged_out?}.
 
 module AuthenticationHelpers
   extend ActiveSupport::Concern
diff --git a/app/controllers/additions/event_decoration.rb b/app/controllers/additions/event_decoration.rb
index 48a4e7b4..76d2e671 100644
--- a/app/controllers/additions/event_decoration.rb
+++ b/app/controllers/additions/event_decoration.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -56,15 +56,15 @@ def icon_for_event(event)
       when 'comment' then 'comment'
       when 'deploy' then 'truck'
       when 'dupe' then 'copy'
-      when 'email' then 'envelope'
-      when 'open' then 'exclamation-sign'
-      when 'reopen' then 'warning-sign'
+      when 'email' then 'envelope-o'
+      when 'open' then 'exclamation-circle'
+      when 'reopen' then 'warning-triangle'
       when 'close'
         case event.data['status']
-          when 'fixed' then 'ok-sign'
-          when 'irrelevant' then 'remove-sign'
+          when 'fixed' then 'check-circle'
+          when 'irrelevant' then 'minus-circle'
         end
-      else 'question-sign'
+      else 'question-circle'
     end
   end
 end
diff --git a/app/controllers/additions/json_detail_responder.rb b/app/controllers/additions/json_detail_responder.rb
index e8a32a7d..a9149183 100644
--- a/app/controllers/additions/json_detail_responder.rb
+++ b/app/controllers/additions/json_detail_responder.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -30,17 +30,13 @@ def json_resource_errors
   end
 
   # @private
-  def api_behavior(error)
-    raise error unless resourceful?
+  def api_behavior
+    raise MissingRenderer.new(format) unless has_renderer?
 
-    if get?
-      display resource
-    elsif post?
-      display resource, status: :created, location: api_location
-    elsif put?
+    if put? || patch?
       display resource, location: api_location
     else
-      head :no_content
+      super
     end
   end
 end
diff --git a/app/controllers/additions/ldap_authentication_helpers.rb b/app/controllers/additions/ldap_authentication_helpers.rb
index f6a14b08..8a22cf8e 100644
--- a/app/controllers/additions/ldap_authentication_helpers.rb
+++ b/app/controllers/additions/ldap_authentication_helpers.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -68,15 +68,25 @@ def log_in(username, password)
       logger.tagged('AuthenticationHelpers') { logger.info "Denying login to #{username}: LDAP authentication failed." }
       return false
     end
+  rescue Net::LDAP::LdapError
+    respond_to do |format|
+      format.html do
+        flash.now[:alert] = t('controllers.sessions.create.ldap_error')
+        return false
+      end
+    end
   end
 
   private
 
   def build_ldap_interface
-    ldap      = Net::LDAP.new
+    ldap_opts = {}
+    if Squash::Configuration.authentication.ldap.ssl
+      ldap_opts[:encryption] = Squash::Configuration.authentication.ldap.encryption_method.to_sym || :start_tls
+    end
+    ldap      = Net::LDAP.new(ldap_opts)
     ldap.host = Squash::Configuration.authentication.ldap.host
     ldap.port = Squash::Configuration.authentication.ldap.port
-    ldap.encryption(:start_tls) if Squash::Configuration.authentication.ldap.ssl
     ldap
   end
 
@@ -88,11 +98,7 @@ def locate_ldap_user(ldap, username)
   end
 
   def find_or_create_user_from_ldap_entry(entry, username)
-    User.where(username: username).create_or_update!({
-                                                         first_name: entry[:givenname].first,
-                                                         last_name:  entry[:sn].first
-                                                     },
-                                                     as: :system
-    )
+    User.where(username: username).create_or_update!(first_name: entry[:givenname].first,
+                                                     last_name:  entry[:sn].first)
   end
 end
diff --git a/app/controllers/additions/password_authentication_helpers.rb b/app/controllers/additions/password_authentication_helpers.rb
index 3b60f5ac..8bee077e 100644
--- a/app/controllers/additions/password_authentication_helpers.rb
+++ b/app/controllers/additions/password_authentication_helpers.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/controllers/api/v1_controller.rb b/app/controllers/api/v1_controller.rb
index a50f420c..2101ad74 100644
--- a/app/controllers/api/v1_controller.rb
+++ b/app/controllers/api/v1_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -49,14 +49,7 @@ class Api::V1Controller < ActionController::Base
     end
     head :unprocessable_entity
   end
-  rescue_from(ActiveRecord::RecordNotFound) do |err|
-    # return 403 or 404 depending on whether it was an auth failure
-    if err.to_s =~ /Couldn't find Project with/
-      head :forbidden
-    else
-      head :not_found
-    end
-  end
+  rescue_from(ActiveRecord::RecordNotFound) { head :not_found }
 
   # API endpoint for exception notifications. Creates a new thread and
   # instantiates an {OccurrencesWorker} to process it.
@@ -81,10 +74,10 @@ def notify
   def deploy
     require_params :project, :environment, :deploy
 
-    project     = Project.find_by_api_key!(params['project']['api_key'])
-    environment = project.environments.with_name(params['environment']['name']).find_or_create!({name: params['environment']['name']}, as: :worker)
+    project = Project.find_by_api_key(params['project']['api_key']) or raise(API::UnknownAPIKeyError)
+    environment = project.environments.with_name(params['environment']['name']).find_or_create!(name: params['environment']['name'])
 
-    environment.deploys.create!(params['deploy'], as: :worker)
+    environment.deploys.create!(deploy_params)
 
     head :ok
   end
@@ -99,14 +92,7 @@ def deploy
 
   def symbolication
     require_params :symbolications
-
-    params['symbolications'].each do |attrs|
-      Symbolication.where(uuid: attrs['uuid']).create_or_update do |symbolication|
-        symbolication.send :write_attribute, :symbols, attrs['symbols']
-        symbolication.send :write_attribute, :lines, attrs['lines']
-      end
-    end
-
+    BackgroundRunner.run SymbolicationCreator, params.slice('symbolications')
     head :created
   end
 
@@ -120,16 +106,7 @@ def symbolication
 
   def deobfuscation
     require_params :api_key, :environment, :build, :namespace
-
-    map = YAML.load(Zlib::Inflate.inflate(Base64.decode64(params['namespace'])))
-    return head(:unprocessable_entity) unless map.kind_of?(Squash::Java::Namespace)
-
-    deploy = Project.find_by_api_key!(params['api_key']).
-        environments.with_name(params['environment']).first!.
-        deploys.find_by_build!(params['build'])
-    deploy.obfuscation_map.try :destroy
-    deploy.create_obfuscation_map!({namespace: map}, as: :api)
-
+    BackgroundRunner.run ObfuscationMapCreator, params.slice('namespace', 'api_key', 'environment', 'build')
     head :created
   end
 
@@ -143,14 +120,8 @@ def deobfuscation
   # * `POST /api/1.0/sourcemap`
 
   def sourcemap
-    require_params :api_key, :environment, :revision, :sourcemap
-
-    sourcemap = YAML.load(Zlib::Inflate.inflate(Base64.decode64(params['sourcemap'])))
-    return head(:unprocessable_entity) unless sourcemap.kind_of?(Squash::Javascript::SourceMap)
-
-    Project.find_by_api_key!(params['api_key']).
-        environments.with_name(params['environment']).find_or_create!({name: params['environment']}, as: :worker).
-        source_maps.create({map: sourcemap, revision: params['revision']}, as: :api)
+    require_params :api_key, :environment, :revision, :sourcemap, :from, :to
+    BackgroundRunner.run SourceMapCreator, params.slice('sourcemap', 'api_key', 'environment', 'revision', 'from', 'to')
     head :created
   end
 
@@ -159,4 +130,8 @@ def sourcemap
   def require_params(*req)
     raise(API::InvalidAttributesError, "Missing required parameter") unless req.map(&:to_s).all? { |key| params[key].present? }
   end
+
+  def deploy_params
+    params.require(:deploy).permit(:revision, :deployed_at, :hostname, :build, :version)
+  end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b171b5c3..d1662aba 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -136,16 +136,18 @@ class ApplicationController < ActionController::Base
 
   rescue_from(ActiveRecord::RecordNotFound) do
     respond_to do |format|
-      format.html { render file: File.join(Rails.public_path, '404.html'), status: :not_found }
+      format.html { render file: File.join(Rails.public_path, '404'), format: :html, status: :not_found }
       format.json { head :not_found }
       format.atom { head :not_found }
     end
   end
 
-  rescue_from(ActiveModel::MassAssignmentSecurity::Error) do
+  rescue_from(ActionController::UnpermittedParameters) do |error|
     respond_to do |format|
-      format.html { redirect_to root_url, alert: t('controllers.application.mass_assignment_security') }
-      format.json { head :bad_request }
+      format.html { render file: File.join(Rails.public_path, '400'), format: :html, status: :bad_request }
+      format.json do
+        render json: {error: "The following parameters cannot be modified: #{error.params.join(', ')}" }, status: :bad_request
+      end
       format.atom { head :bad_request }
     end
   end
diff --git a/app/controllers/bugs_controller.rb b/app/controllers/bugs_controller.rb
index ff7c72ff..b26621de 100644
--- a/app/controllers/bugs_controller.rb
+++ b/app/controllers/bugs_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -37,9 +37,6 @@ class BugsController < ApplicationController
   }
   SORTS.default     = SORTS['latest']
 
-  # Valid columns to filter the bug list on.
-  VALID_FILTER_KEYS = %w( fixed irrelevant assigned_user_id deploy_id search any_occurrence_crashed )
-
   # Number of Bugs to return per page.
   PER_PAGE          = 50
 
@@ -100,7 +97,7 @@ def index
       end
 
       format.json do
-        filter = (params[:filter] || {}).slice(*VALID_FILTER_KEYS)
+        filter = (params[:filter] || ActionController::Parameters.new).permit(:fixed, :irrelevant, :assigned_user_id, :deploy_id, :search, :any_occurrence_crashed)
         filter.each { |k, v| filter[k] = nil if v == '' }
 
         filter.delete('deploy_id') if filter['deploy_id'].nil? # no deploy set means ANY deploy, not NO deploy
@@ -115,7 +112,7 @@ def index
         sort_column, default_dir = SORTS[params[:sort]]
 
         dir = if params[:dir].kind_of?(String) then
-                SORT_DIRECTIONS.include?(params[:dir].upcase) ? params[:dir] : default_dir
+                SORT_DIRECTIONS.include?(params[:dir].upcase) ? params[:dir].upcase : default_dir
               else
                 default_dir
               end
@@ -165,7 +162,7 @@ def show
 
     # We use `duplicate_of_number` on the view and `duplicate_of_id` in the
     # backend, so we need to copy between those values.
-    @bug.duplicate_of_number = @bug.duplicate_of.try(:number)
+    @bug.duplicate_of_number = @bug.duplicate_of.try!(:number)
 
     @new_issue_url = Service::JIRA.new_issue_link(summary:     t('controllers.bugs.show.jira_link.summary',
                                                                  class_name: @bug.class_name,
@@ -191,7 +188,7 @@ def show
   # Routes
   # ------
   #
-  # * `PUT /projects/:project_id/environments/:environment_id/bugs/:id.json`
+  # * `PATCH /projects/:project_id/environments/:environment_id/bugs/:id.json`
   #
   # Path Parameters
   # ---------------
@@ -214,7 +211,7 @@ def update
     # We use `duplicate_of_number` on the view and `duplicate_of_id` in the
     # backend, so we need to copy between those values.
     add_error = false
-    if (number = params[:bug][:duplicate_of_number]).present?
+    if (number = params[:bug].delete('duplicate_of_number')).present?
       original_bug = @environment.bugs.where(number: number).first
       if original_bug
         @bug.duplicate_of_id = original_bug.id
@@ -228,9 +225,9 @@ def update
     # hacky fix for the JIRA status dropdown
     params[:bug][:jira_status_id] = params[:bug][:jira_status_id].presence
 
-    if !add_error && @bug.update_attributes(params[:bug], as: current_user.role(@bug))
+    if !add_error && @bug.update_attributes(bug_params)
       if params[:comment].kind_of?(Hash) && params[:comment][:body].present?
-        @comment      = @bug.comments.build(params[:comment], as: :creator)
+        @comment      = @bug.comments.build(comment_params)
         @comment.user = current_user
         @comment.save
       end
@@ -238,7 +235,7 @@ def update
         if params[:notification_threshold][:threshold].blank? && params[:notification_threshold][:period].blank?
           current_user.notification_thresholds.where(bug_id: @bug.id).delete_all
         else
-          @notification_threshold = current_user.notification_thresholds.where(bug_id: @bug.id).create_or_update(params[:notification_threshold], as: :user)
+          @notification_threshold = current_user.notification_thresholds.where(bug_id: @bug.id).create_or_update(notification_threshold_params)
         end
       end
     else
@@ -390,4 +387,20 @@ def decorate_bug(bug)
         notify_on_occurrence: bug.notify_on_occurrence.include?(current_user.id)
     )
   end
+
+  def bug_params
+    params.require(:bug).permit(:assigned_user, :assigned_user_id,
+                                :resolution_revision, :fixed, :fix_deployed,
+                                :irrelevant, :duplicate_of, :duplicate_of_id,
+                                :jira_isssue, :jira_status_id, :page_threshold,
+                                :page_period)
+  end
+
+  def comment_params
+    params.require(:comment).permit(:body)
+  end
+
+  def notification_threshold_params
+    params.require(:notification_threshold).permit(:threshold, :period)
+  end
 end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 6dcfc0b9..4faa024b 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ def index
   # | `comment` | Parameterized hash of Comment fields. |
 
   def create
-    @comment      = @bug.comments.build(params[:comment], as: :creator)
+    @comment      = @bug.comments.build(comment_params)
     @comment.user = current_user
     @comment.save
 
@@ -88,7 +88,7 @@ def create
   # Routes
   # ------
   #
-  # * `PUT /projects/:project_id/environments/:environment_id/bugs/:bug_id/comments/:id.json`
+  # * `PATCH /projects/:project_id/environments/:environment_id/bugs/:bug_id/comments/:id.json`
   #
   # Path Parameters
   # ---------------
@@ -107,7 +107,7 @@ def create
   # | `comment` | Parameterized hash of Comment fields. |
 
   def update
-    @comment.update_attributes params[:comment], as: current_user.role(@comment)
+    @comment.update_attributes comment_params
 
     respond_with @project, @environment, @bug, @comment
   end
@@ -158,4 +158,8 @@ def decorate(comments)
       )
     end
   end
+
+  def comment_params
+    params.require(:comment).permit(:body)
+  end
 end
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
new file mode 100644
index 00000000..cfc2c70b
--- /dev/null
+++ b/app/controllers/commits_controller.rb
@@ -0,0 +1,163 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Controller for working with objects that are accessed from a {Project}'s
+# repository (mainly commits). This controller is capable of managing the
+# situation where the repository is very slow or inaccessible.
+
+class CommitsController < ApplicationController
+  brushes = YAML.load_file(Rails.root.join('data', 'brushes.yml'))
+
+  # A map of file extensions to the SyntaxHighlighter brush to use.
+  BRUSH_FOR_EXTENSION = brushes['by_extension']
+  # A map of file names to the SyntaxHighlighter brush to use.
+  BRUSH_FOR_FILENAME  = brushes['by_filename']
+  # The SyntaxHighligher brush to use for unknown file types.
+  DEFAULT_BRUSH       = brushes['default']
+
+  before_filter :find_project
+  respond_to :json
+
+  # Responds with the 10 most recent commits.
+  #
+  # Routes
+  # ------
+  #
+  # * `GET /projects/:project_id/commits`
+  #
+  # Path Parameters
+  # ---------------
+  #
+  # |              |                     |
+  # |:-------------|:--------------------|
+  # | `project_id` | The Project's slug. |
+
+  def index
+    @commits = @project.repo.log(10)
+    respond_with @commits
+  end
+
+  # Responds with a context snippet given a revision, file, and line. The
+  # response includes the context snippet and some metadata about it in JSON
+  # format.
+  #
+  # Routes
+  # ------
+  #
+  # * `GET /projects/:project_id/commits/:id/context.json`
+  #
+  # Path Parameters
+  # ---------------
+  #
+  # |              |                                                               |
+  # |:-------------|:--------------------------------------------------------------|
+  # | `project_id` | The Project's slug.                                           |
+  # | `id`         | The identifier of the source code revision to use (required). |
+  #
+  # Query Parameters
+  # ----------------
+  #
+  # |           |                                                                              |
+  # |:----------|:-----------------------------------------------------------------------------|
+  # | `file`    | The path to the file, relative to the project root (required).               |
+  # | `line`    | The line number within the file (required).                                  |
+  # | `context` | The number of lines of context to use before and after the line (default 3). |
+  #
+  # Responses
+  # ---------
+  #
+  # ### Successful response: 200 OK
+  #
+  # The response body will be a JSON-encoded hash with the following keys:
+  #
+  # |              |                                                                        |
+  # |:-------------|:-----------------------------------------------------------------------|
+  # | `code`       | The code context snippet.                                              |
+  # | `brush`      | The name of a SyntaxHighlighter brush to use when displaying the code. |
+  # | `first_line` | The line number of the first line in the snippet.                      |
+  #
+  # ### Error responses
+  #
+  # All error response bodies will be a JSON-encoded hash with one key, `error`,
+  # containing the localized error description. The following errors are
+  # possible:
+  #
+  # * Required parameter missing: 400 Bad Request
+  # * Repository couldn't be loaded: 422 Unprocessable Entity
+  # * Commit not found: 422 Unprocessable Entity
+  # * File not found in repo: 422 Unprocessable Entity
+  # * Line number out of bounds: 422 Unprocessable Entity
+
+  def context
+    if @project.repo.nil?
+      return respond_to do |format|
+        format.json { render json: {error: t('controllers.commits.context.repo_nil')}, status: :unprocessable_entity }
+      end
+    end
+
+    if params[:file].blank? || params[:line].blank?
+      return respond_to do |format|
+        format.json { render json: {error: t('controllers.commits.context.missing_param')}, status: :bad_request }
+      end
+    end
+
+    blob = @project.repo.object(params[:id] + '^{tree}:' + params[:file]) rescue nil
+    if blob.nil?
+      @project.repo(&:fetch)
+      blob = @project.repo.object(params[:id] + '^{tree}:' + params[:file]) rescue nil
+      if blob.nil?
+        return respond_to do |format|
+          format.json { render json: {error: t('controllers.commits.context.commit_not_found')}, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    context = (params[:context].presence || 3).to_i
+    context = 3 if context < 0
+    line = params[:line].to_i
+
+    lines = blob.contents.split("\n")
+
+    if line < 1 || line > lines.size
+      return respond_to do |format|
+        format.json { render json: {error: t('controllers.commits.context.line_out_of_bounds')}, status: :unprocessable_entity }
+      end
+    end
+
+    top_line    = [line-context-1, 0].max
+    bottom_line = [line+context-1, lines.size - 1].min
+
+    snippet = lines[top_line, bottom_line-top_line+1]
+    # remove blank lines from the top of the code snippet; otherwise
+    # SyntaxHighlighter will remove them but fail to renumber the line numbers
+    # correctly
+    while snippet.first.empty?
+      snippet.shift
+      top_line += 1
+    end
+
+    brush = brush_from_filename(File.basename(params[:file]))
+
+    respond_to do |format|
+      format.json { render json: {code: snippet.join("\n"), brush: brush, first_line: top_line + 1} }
+    end
+  end
+
+  private
+
+  def brush_from_filename(name)
+    ext_brush = BRUSH_FOR_EXTENSION[BRUSH_FOR_EXTENSION.keys.detect { |ext| name.end_with? ext }]
+    BRUSH_FOR_FILENAME[name] || ext_brush || DEFAULT_BRUSH
+  end
+end
diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb
index 44d7fa4a..4b9227a4 100644
--- a/app/controllers/emails_controller.rb
+++ b/app/controllers/emails_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ class EmailsController < ApplicationController
 
   def index
     @emails = current_user.emails.redirected.
-        where(project_id: @project.try(:id)).
+        where(project_id: @project.try!(:id)).
         order('email ASC').
         limit(10).
         includes(:user)
@@ -80,7 +80,7 @@ def index
   # | `email` | Parameterized hash of new Email attribute values. |
 
   def create
-    @email = current_user.emails.build(params[:email], as: :user)
+    @email = current_user.emails.build(email_params)
     @email.project = @project
     @email.save
     respond_with @email, location: nil
@@ -122,4 +122,8 @@ def decorate(emails)
       )
     end
   end
+
+  def email_params
+    params.require(:email).permit(:email)
+  end
 end
diff --git a/app/controllers/environments_controller.rb b/app/controllers/environments_controller.rb
index 31943f21..82d4b709 100644
--- a/app/controllers/environments_controller.rb
+++ b/app/controllers/environments_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ class EnvironmentsController < ApplicationController
   # Routes
   # ------
   #
-  # * `PUT /projects/:project_id/environments/:id.json`
+  # * `PATCH /projects/:project_id/environments/:id.json`
   #
   # Path Parameters
   # ---------------
@@ -56,7 +56,7 @@ class EnvironmentsController < ApplicationController
   # | `environment` | Parameterized hash of Environment fields. |
 
   def update
-    @environment.update_attributes params[:environment], as: :admin
+    @environment.update_attributes environment_params
     respond_with @environment, location: project_url(@project)
   end
 
@@ -65,4 +65,8 @@ def update
   def find_environment
     @environment = @project.environments.find_by_name!(params[:id])
   end
+
+  def environment_params
+    params.require(:environment).permit(:sends_emails, :notifies_pagerduty)
+  end
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 69b7863d..835db306 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/controllers/jira/issues_controller.rb b/app/controllers/jira/issues_controller.rb
index 16111f4f..d34a3b2c 100644
--- a/app/controllers/jira/issues_controller.rb
+++ b/app/controllers/jira/issues_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/controllers/jira/projects_controller.rb b/app/controllers/jira/projects_controller.rb
index ae209405..b1980b9e 100644
--- a/app/controllers/jira/projects_controller.rb
+++ b/app/controllers/jira/projects_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/controllers/jira/statuses_controller.rb b/app/controllers/jira/statuses_controller.rb
index 64f84174..d6b74278 100644
--- a/app/controllers/jira/statuses_controller.rb
+++ b/app/controllers/jira/statuses_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/controllers/notification_thresholds_controller.rb b/app/controllers/notification_thresholds_controller.rb
index 6069c3ac..6324d309 100644
--- a/app/controllers/notification_thresholds_controller.rb
+++ b/app/controllers/notification_thresholds_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,6 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+# Singleton resource controller that works with a User's {NotificationThreshold}
+# for a Bug.
+
 class NotificationThresholdsController < ApplicationController
   before_filter :find_project
   before_filter :find_environment
@@ -19,16 +22,78 @@ class NotificationThresholdsController < ApplicationController
   before_filter :membership_required
   respond_to :json, except: :destroy
 
+  # Creates a new NotificationThreshold from the given attributes.
+  #
+  # Routes
+  # ------
+  #
+  # * `POST /projects/:project_id/environments/:environment_id/bugs/:bug_id/notification_threshold`
+  #
+  # Path Parameters
+  # ---------------
+  #
+  # |                   |                                                                                                        |
+  # |:------------------|:-------------------------------------------------------------------------------------------------------|
+  # | `:project_id`     | The slug of a {Project}.                                                                               |
+  # | `:environment_id` | The name of an {Environment} within that Project.                                                      |
+  # | `:bug_id`         | The number of a {Bug} within that Environment. The NotificationThreshold will be created for this Bug. |
+  #
+  # Body Parameters
+  # ---------------
+  #
+  # |                          |                                                                  |
+  # |:-------------------------|:-----------------------------------------------------------------|
+  # | `notification_threshold` | A parameterized hash of NotificationThreshold fields and values. |
+
   def create
-    @notification_threshold = current_user.notification_thresholds.where(bug_id: @bug.id).create_or_update(params[:notification_threshold], as: :user)
+    @notification_threshold = current_user.notification_thresholds.where(bug_id: @bug.id).create_or_update(notification_threshold_params)
     respond_with @notification_threshold, location: project_environment_bug_url(@project, @environment, @bug)
   end
 
+  # Updates a NotificationThreshold with the given attributes.
+  #
+  # Routes
+  # ------
+  #
+  # * `PATCH /projects/:project_id/environments/:environment_id/bugs/:bug_id/notification_threshold`
+  #
+  # Path Parameters
+  # ---------------
+  #
+  # |                   |                                                   |
+  # |:------------------|:--------------------------------------------------|
+  # | `:project_id`     | The slug of a {Project}.                          |
+  # | `:environment_id` | The name of an {Environment} within that Project. |
+  # | `:bug_id`         | The number of a {Bug} within that Environment.    |
+  #
+  # Body Parameters
+  # ---------------
+  #
+  # |                          |                                                                  |
+  # |:-------------------------|:-----------------------------------------------------------------|
+  # | `notification_threshold` | A parameterized hash of NotificationThreshold fields and values. |
+
   def update
-    @notification_threshold = current_user.notification_thresholds.where(bug_id: @bug.id).create_or_update(params[:notification_threshold], as: :user)
+    @notification_threshold = current_user.notification_thresholds.where(bug_id: @bug.id).create_or_update(notification_threshold_params)
     respond_with @notification_threshold, location: project_environment_bug_url(@project, @environment, @bug)
   end
 
+  # Deletes a NotificationThreshold.
+  #
+  # Routes
+  # ------
+  #
+  # * `DELETE /projects/:project_id/environments/:environment_id/bugs/:bug_id/notification_threshold`
+  #
+  # Path Parameters
+  # ---------------
+  #
+  # |                   |                                                   |
+  # |:------------------|:--------------------------------------------------|
+  # | `:project_id`     | The slug of a {Project}.                          |
+  # | `:environment_id` | The name of an {Environment} within that Project. |
+  # | `:bug_id`         | The number of a {Bug} within that Environment.    |
+
   def destroy
     current_user.notification_thresholds.where(bug_id: @bug.id).delete_all
     respond_to do |format|
@@ -36,4 +101,10 @@ def destroy
       format.html { redirect_to project_environment_bug_url(@project, @environment, @bug, anchor: 'notifications') }
     end
   end
+
+  private
+
+  def notification_threshold_params
+    params.require(:notification_threshold).permit(:threshold, :period)
+  end
 end
diff --git a/app/controllers/occurrences_controller.rb b/app/controllers/occurrences_controller.rb
index e590ee83..a727fe45 100644
--- a/app/controllers/occurrences_controller.rb
+++ b/app/controllers/occurrences_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ def index
     respond_to do |format|
       format.json do
         dir = params[:dir]
-        dir = 'desc' unless SORT_DIRECTIONS.include?(dir.try(:upcase))
+        dir = 'DESC' unless SORT_DIRECTIONS.include?(dir.try!(:upcase))
 
         @occurrences = @bug.occurrences.order("occurred_at #{dir}").limit(50)
 
@@ -207,10 +207,10 @@ def aggregate
 
   def histogram
     occurrences = @bug.occurrences.
-        where("occurred_at >= ?", 30.days.ago).
+        where('occurred_at >= ?', 30.days.ago).
         group("date_trunc('hour', occurred_at)").
-        count.map do |date_str, count|
-      [Time.parse(date_str + " UTC").to_i * 1000, count]
+        count.map do |date, count|
+      [date.to_i * 1000, count]
     end
     occurrences.sort_by!(&:first)
     if occurrences.empty?
diff --git a/app/controllers/project/membership_controller.rb b/app/controllers/project/membership_controller.rb
index 19e62d23..c21e983a 100644
--- a/app/controllers/project/membership_controller.rb
+++ b/app/controllers/project/membership_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ def edit
   # Routes
   # ------
   #
-  # * `PUT /projects/:project_id/membership`
+  # * `PATCH /projects/:project_id/membership`
   #
   # Path Parameters
   # ---------------
@@ -83,7 +83,7 @@ def edit
   # | `membership` | Parameterized hash of new Membership attribute values. |
 
   def update
-    @membership.update_attributes params[:membership], as: :user
+    @membership.update_attributes membership_params
     respond_with @membership, location: edit_project_my_membership_url(@project)
   end
 
@@ -120,7 +120,7 @@ def destroy
   private
 
   def find_membership
-    @membership = @current_user.memberships.find_by_project_id!(@project.id)
+    @membership = current_user.memberships.find_by_project_id!(@project.id)
   end
 
   def must_not_be_owner
@@ -133,4 +133,10 @@ def must_not_be_owner
       return true
     end
   end
+
+  def membership_params
+    params.require(:membership).permit(:send_assignment_emails,
+                                       :send_comment_emails,
+                                       :send_resolution_emails)
+  end
 end
diff --git a/app/controllers/project/memberships_controller.rb b/app/controllers/project/memberships_controller.rb
index d0b8dec5..c644207e 100644
--- a/app/controllers/project/memberships_controller.rb
+++ b/app/controllers/project/memberships_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -74,10 +74,10 @@ def index
 
   def create
     if params[:membership][:user_username]
-      params[:membership][:user_id] = User.find_by_username(params[:membership].delete('user_username')).try(:id)
+      params[:membership][:user_id] = User.find_by_username(params[:membership].delete('user_username')).try!(:id)
     end
 
-    @membership = @project.memberships.create(params[:membership], as: current_user.role(@project))
+    @membership = @project.memberships.create(membership_params)
     respond_with @project, @membership
   end
 
@@ -86,7 +86,7 @@ def create
   # Routes
   # ------
   #
-  # * `PUT /projects/:project_id/memberships/:id.json`
+  # * `PATCH /projects/:project_id/memberships/:id.json`
   #
   # Path Parameters
   # ---------------
@@ -105,7 +105,7 @@ def create
   # | `membership` | Parameterized hash of Membership fields. |
 
   def update
-    @membership.update_attributes params[:membership], as: current_user.role(@project)
+    @membership.update_attributes membership_params
 
     respond_with @project, @membership
   end
@@ -155,4 +155,15 @@ def decorate(memberships)
       )
     end
   end
+
+  def membership_params
+    params.require(:membership).permit(*(
+        case current_user.role(@project)
+          when :admin
+            [:user_id]
+          when :owner
+            [:user_id, :admin]
+        end
+    ))
+  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a996b982..91815b97 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,15 +15,6 @@
 # Controller for working with {Project Projects}.
 
 class ProjectsController < ApplicationController
-  brushes             = YAML.load_file(Rails.root.join('data', 'brushes.yml'))
-
-  # A map of file extensions to the SyntaxHighlighter brush to use.
-  BRUSH_FOR_EXTENSION = brushes['by_extension']
-  # A map of file names to the SyntaxHighlighter brush to use.
-  BRUSH_FOR_FILENAME  = brushes['by_filename']
-  # The SyntaxHighligher brush to use for unknown file types.
-  DEFAULT_BRUSH       = brushes['default']
-
   before_filter :find_project, except: [:index, :create]
   before_filter :admin_login_required, only: [:update, :rekey]
   before_filter :owner_login_required, only: :destroy
@@ -113,8 +104,8 @@ def show
   # | `project` | Parameterized hash of Project fields. |
 
   def create
-    project_attrs = params[:project].merge(validate_repo_connectivity: true)
-    @project      = current_user.owned_projects.create(project_attrs, as: :owner)
+    project_attrs = project_params_for_creation.merge(validate_repo_connectivity: true)
+    @project      = current_user.owned_projects.create(project_attrs)
     respond_with @project do |format|
       format.json do
         if @project.valid?
@@ -143,11 +134,6 @@ def create
   # | `id` | The Project's slug. |
 
   def edit
-    class << @project
-      def filter_paths_string() filter_paths.join("\n") end
-      def whitelist_paths_string() whitelist_paths.join("\n") end
-    end
-
     respond_with @project
   end
 
@@ -156,7 +142,7 @@ def whitelist_paths_string() whitelist_paths.join("\n") end
   # Routes
   # ------
   #
-  # * `PUT /projects/:id.json`
+  # * `PATCH /projects/:id.json`
   #
   # Path Parameters
   # ---------------
@@ -175,27 +161,10 @@ def whitelist_paths_string() whitelist_paths.join("\n") end
   # | `project` | Parameterized hash of Project fields. |
 
   def update
-    if params[:project][:owner_username]
-      params[:project][:owner_id] = User.find_by_username(params[:project].delete('owner_username')).try(:id)
-    end
-
-    if (fps = params[:project].delete(:filter_paths_string))
-      params[:project][:filter_paths] = fps.split(/[\r\n]+/).reject(&:blank?)
-    end
-
-    if (wps = params[:project].delete(:whitelist_paths_string))
-      params[:project][:whitelist_paths] = wps.split(/[\r\n]+/).reject(&:blank?)
-    end
-
-    @project.assign_attributes params[:project].merge(validate_repo_connectivity: true), as: current_user.role(@project)
+    @project.assign_attributes project_params_for_update.merge(validate_repo_connectivity: true)
     @project.uses_releases_override = true if @project.uses_releases_changed?
     @project.save
 
-    class << @project
-      def filter_paths_string() filter_paths.join("\n") end
-      def whitelist_paths_string() whitelist_paths.join("\n") end
-    end
-
     respond_with @project
   end
 
@@ -205,7 +174,7 @@ def whitelist_paths_string() whitelist_paths.join("\n") end
   # Routes
   # ------
   #
-  # * `PUT /projects/:id/rekey`
+  # * `PATCH /projects/:id/rekey`
   #
   # Path Parameters
   # ---------------
@@ -240,121 +209,13 @@ def destroy
     redirect_to root_url, flash: {success: t('controllers.projects.destroy.deleted', name: @project.name)}
   end
 
-  # Responds with a context snippet given a revision, file, and line. The
-  # response includes the context snippet and some metadata about it in JSON
-  # format.
-  #
-  # Routes
-  # ------
-  #
-  # * `GET /project/:id/context.json`
-  #
-  # Path Parameters
-  # ---------------
-  #
-  # |      |                     |
-  # |:-----|:--------------------|
-  # | `id` | The Project's slug. |
-  #
-  # Query Parameters
-  # ----------------
-  #
-  # |            |                                                                              |
-  # |:-----------|:-----------------------------------------------------------------------------|
-  # | `revision` | The commit ID of the source code revision to use (required).                 |
-  # | `file`     | The path to the file, relative to the project root (required).               |
-  # | `line`     | The line number within the file (required).                                  |
-  # | `context`  | The number of lines of context to use before and after the line (default 3). |
-  #
-  # Responses
-  # ---------
-  #
-  # ### Successful response: 200 OK
-  #
-  # The response body will be a JSON-encoded hash with the following keys:
-  #
-  # |              |                                                                        |
-  # |:-------------|:-----------------------------------------------------------------------|
-  # | `code`       | The code context snippet.                                              |
-  # | `brush`      | The name of a SyntaxHighlighter brush to use when displaying the code. |
-  # | `first_line` | The line number of the first line in the snippet.                      |
-  #
-  # ### Error responses
-  #
-  # All error response bodies will be a JSON-encoded hash with one key, `error`,
-  # containing the localized error description. The following errors are
-  # possible:
-  #
-  # * Required parameter missing: 400 Bad Request
-  # * Repository couldn't be loaded: 422 Unprocessable Entity
-  # * Commit not found: 422 Unprocessable Entity
-  # * File not found in repo: 422 Unprocessable Entity
-  # * Line number out of bounds: 422 Unprocessable Entity
-
-  def context
-    if @project.repo.nil?
-      return respond_to do |format|
-        format.json { render json: {error: t('controllers.projects.context.repo_nil')}, status: :unprocessable_entity }
-      end
-    end
-
-    if params[:revision].blank? || params[:file].blank? || params[:line].blank?
-      return respond_to do |format|
-        format.json { render json: {error: t('controllers.projects.context.missing_param')}, status: :bad_request }
-      end
-    end
-
-    blob = @project.repo.object(params[:revision] + '^{tree}:' + params[:file]) rescue nil
-    if blob.nil?
-      @project.repo(&:fetch)
-      blob = @project.repo.object(params[:revision] + '^{tree}:' + params[:file]) rescue nil
-      if blob.nil?
-        return respond_to do |format|
-          format.json { render json: {error: t('controllers.projects.context.commit_not_found')}, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    context = (params[:context].presence || 3).to_i
-    context = 3 if context < 0
-    line = params[:line].to_i
-
-    lines = blob.contents.split("\n")
-
-    if line < 1 || line > lines.size
-      return respond_to do |format|
-        format.json { render json: {error: t('controllers.projects.context.line_out_of_bounds')}, status: :unprocessable_entity }
-      end
-    end
-
-    top_line    = [line-context-1, 0].max
-    bottom_line = [line+context-1, lines.size - 1].min
-
-    snippet = lines[top_line, bottom_line-top_line+1]
-    # remove blank lines from the top of the code snippet; otherwise
-    # SyntaxHighlighter will remove them but fail to renumber the line numbers
-    # correctly
-    while snippet.first.empty?
-      snippet.shift
-      top_line += 1
-    end
-
-    brush = brush_from_filename(File.basename(params[:file]))
-
-    respond_to do |format|
-      format.json { render json: {code: snippet.join("\n"), brush: brush, first_line: top_line + 1} }
-    end
-  end
-
   private
 
   def find_project
     @project = Project.find_from_slug!(params[:id])
-  end
-
-  def brush_from_filename(name)
-    ext_brush = BRUSH_FOR_EXTENSION[BRUSH_FOR_EXTENSION.keys.detect { |ext| name.end_with? ext }]
-    BRUSH_FOR_FILENAME[name] || ext_brush || DEFAULT_BRUSH
+    class << @project
+      include ProjectAdditions
+    end
   end
 
   def decorate(projects)
@@ -372,4 +233,38 @@ def decorate(projects)
       decorate_block.(projects)
     end
   end
+
+  def admin_permitted_parameters
+    [:name, :repository_url, :default_environment, :default_environment_id,
+     :filter_paths, :filter_paths_string, :whitelist_paths,
+     :whitelist_paths_string, :commit_url_format, :critical_mailing_list,
+     :all_mailing_list, :critical_threshold, :sender, :locale,
+     :sends_emails_outside_team, :trusted_email_domain, :pagerduty_enabled,
+     :pagerduty_service_key, :always_notify_pagerduty, :uses_releases,
+     :disable_message_filtering, :blamer_type, :digest_in_asset_names]
+  end
+
+  def project_params_for_creation
+    params.require(:project).permit(*admin_permitted_parameters)
+  end
+
+  def project_params_for_update
+    case current_user.role(@project)
+      when :owner
+        params.require(:project).permit(*(admin_permitted_parameters + [:owner_id]))
+      when :admin
+        project_params_for_creation
+    end
+  end
+
+  module ProjectAdditions
+    def filter_paths_string() filter_paths.join("\n") end
+    def whitelist_paths_string() whitelist_paths.join("\n") end
+
+    def filter_paths_string=(str) self.filter_paths = (str || '').split(/\r?\n/) end
+    def whitelist_paths_string=(str) self.whitelist_paths = (str || '').split(/\r?\n/) end
+
+    def owner_username() owner.username end
+    def owner_username=(name) self.owner = User.find_by_username(name) end
+  end
 end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f239c790..0b9b4b8b 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -59,20 +59,20 @@ def search
           user = find_users(words.first[1..-1]).only
           url = user_url(user) if user
         else
-          project = find_projects(words[0]).only.try(:sluggable)
+          project = find_projects(words[0]).only.try!(:sluggable)
           url = project_url(project) if project
         end
       when 2
-        project = find_projects(words[0]).only.try(:sluggable)
+        project = find_projects(words[0]).only.try!(:sluggable)
         env = find_environments(project, words[1]).only if project
         url = project_environment_bugs_url(project, env) if env
       when 3
-        project = find_projects(words[0]).only.try(:sluggable)
+        project = find_projects(words[0]).only.try!(:sluggable)
         env = find_environments(project, words[1]).only if project
         bug = env.bugs.find_by_number(words[2].to_i) if env
         url = project_environment_bug_url(project, env, bug) if bug
       when 4
-        project = find_projects(words[0]).only.try(:sluggable)
+        project = find_projects(words[0]).only.try!(:sluggable)
         env = find_environments(project, words[1]).only if project
         bug = env.bugs.find_by_number(words[2].to_i) if env
         occurrence = bug.occurrences.find_by_number(words[3].to_i) if bug
@@ -139,7 +139,7 @@ def suggestions
                         end
                       end
                     when 2
-                      project = find_projects(words[0]).only.try(:sluggable)
+                      project = find_projects(words[0]).only.try!(:sluggable)
                       envs = find_environments(project, words[1]).limit(10) if project
                       envs.map do |env|
                         {
@@ -152,7 +152,7 @@ def suggestions
                         }
                       end if project
                     when 3
-                      project = find_projects(words[0]).only.try(:sluggable)
+                      project = find_projects(words[0]).only.try!(:sluggable)
                       env = find_environments(project, words[1]).only if project
                       bug = env.bugs.find_by_number(words[2].to_i) if env
                       [{
@@ -163,7 +163,7 @@ def suggestions
                            bug:         bug.as_json
                        }] if bug
                     when 4
-                      project = find_projects(words[0]).only.try(:sluggable)
+                      project = find_projects(words[0]).only.try!(:sluggable)
                       env = find_environments(project, words[1]).only if project
                       bug = env.bugs.find_by_number(words[2].to_i) if env
                       occurrence = bug.occurrences.find_by_number(words[3].to_i) if bug
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 37ea4382..895712ea 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 # {AuthenticationHelpers} for more information on how authentication works.
 
 class SessionsController < ApplicationController
-  skip_before_filter :login_required, except: :destroy
+  skip_before_filter :login_required, only: [:new, :create]
   before_filter :must_be_unauthenticated, except: :destroy
 
   respond_to :html
@@ -77,18 +77,11 @@ def create
     else
       respond_to do |format|
         format.html do
-          flash.now[:alert] = t('controllers.sessions.create.incorrect_login')
+          flash.now[:alert] ||= t('controllers.sessions.create.incorrect_login')
           render 'new'
         end
       end
     end
-  rescue Net::LDAP::LdapError
-    respond_to do |format|
-      format.html do
-        flash.now[:alert] = t('controllers.sessions.create.ldap_error')
-        render 'new'
-      end
-    end
   end
 
   # Logs a user out and clears his/her session. Redirects to the login URL.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index bb74f517..a3516e29 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ def create
       return redirect_to(login_url, alert: t('controllers.users.create.disabled'))
     end
 
-    @user = User.create(params[:user], as: :user)
+    @user = User.create(user_params)
     respond_with @user do |format|
       format.html do
         if @user.valid?
@@ -106,4 +106,9 @@ def decorate(users, project=nil)
       user.as_json.merge(is_member: project ? user.memberships.where(project_id: project.id).exists? : nil)
     end
   end
+
+  def user_params
+    params.require(:user).permit(:username, :password, :password_confirmation,
+                                 :email_address, :first_name, :last_name)
+  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3c479d98..fa9aa5ed 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -51,8 +51,8 @@ def commit_link(project, commit)
   # Creates a link to open a project file in the user's editor. See the
   # editor_link.js.coffee file for more information.
   #
-  # @param [String] editor The editor ("textmate", "sublime", "vim", or
-  #   "emacs").
+  # @param [String] editor The editor ("textmate", "sublime", "vim", "emacs",
+  #   or "rubymine").
   # @param [Project] project The project containing the file.
   # @param [String] file The file path relative to the project root.
   # @param [String] line The line number within the file.
diff --git a/app/helpers/mail_helper.rb b/app/helpers/mail_helper.rb
index 31fdf09a..57dc2d27 100644
--- a/app/helpers/mail_helper.rb
+++ b/app/helpers/mail_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # Helper methods for email content.
 
 module MailHelper
+  include TextBacktraceRendering
+
   # The typical maximum line width for plaintext emails (per RFC 2822).
   EMAIL_WRAP_WIDTH = 78
 
diff --git a/app/helpers/occurrences_helper.rb b/app/helpers/occurrences_helper.rb
index 058ddb6a..685eab4f 100644
--- a/app/helpers/occurrences_helper.rb
+++ b/app/helpers/occurrences_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 1807724e..2faa87f4 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,36 +14,13 @@
 
 # Sends notifications of {Bug} events, such as new Bugs and critical Bugs. See
 # the `mailer.yml` Configoro file for mail-related configuration options.
-#
-# This mailer conditionally sends emails. Some of the mail methods will return
-# `nil`. Sadly, thanks to Rails magic, this means these methods _actually_
-# return an empty `Mail::Message` instance. In order to ensure that only the
-# appropriate messages are delivered, the {.deliver} method should be used to
-# send all emails.
 
 class NotificationMailer < ActionMailer::Base
-  helper :mail
+  helper :mail, :application
 
   default from: Squash::Configuration.mailer.from
   default_url_options.merge! Squash::Configuration.mailer.default_url_options.symbolize_keys
 
-  # Creates and delivers an email. If the message is empty (i.e., `nil` was
-  # returned from the mailer action), no email is delivered.
-  #
-  # @param [Symbol] template The mailer action to invoke.
-  # @param args Arguments to pass to the action.
-  # @return [true, false] Whether an email was delivered.
-
-  def self.deliver(template, *args)
-    mail = send(template, *args)
-    if mail.from.present? #HACK generates empty mails when nil is returned
-      mail.deliver
-      return true
-    else
-      return false
-    end
-  end
-
   # Creates a message addressed to the {Project}'s `all_mailing_list` informing
   # of a new Bug.
   #
@@ -104,7 +81,7 @@ def blame(bug)
   def reopened(bug)
     @bug = bug
 
-    emails = bug.assigned_user.try(:email) || bug.blamed_email
+    emails = bug.assigned_user.try!(:email) || bug.blamed_email
     return nil unless should_send?(bug, emails)
 
     mail to:      emails,
diff --git a/app/middleware/ping.rb b/app/middleware/ping.rb
index 89862c6e..3eaedeed 100644
--- a/app/middleware/ping.rb
+++ b/app/middleware/ping.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/models/additions/ldap_authentication.rb b/app/models/additions/ldap_authentication.rb
index 5ebdcc49..96a85e83 100644
--- a/app/models/additions/ldap_authentication.rb
+++ b/app/models/additions/ldap_authentication.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # Squash install is configured to use LDAP-based authentication.
 
 module LdapAuthentication
+  extend ActiveSupport::Concern
 
   # @return [String] This user's LDAP distinguished name (DN).
 
@@ -26,7 +27,7 @@ def distinguished_name
   private
 
   def create_primary_email
-    emails.create!({email: "#{username}@#{Squash::Configuration.mailer.domain}", primary: true}, as: :system)
+    emails.create!(email: "#{username}@#{Squash::Configuration.mailer.domain}", primary: true)
   end
 end
 
diff --git a/app/models/additions/password_authentication.rb b/app/models/additions/password_authentication.rb
index 078b71dc..66d96788 100644
--- a/app/models/additions/password_authentication.rb
+++ b/app/models/additions/password_authentication.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -27,14 +27,10 @@ module PasswordAuthentication
     # @return [String] Virtual attribute containing the unencrypted password on
     #   signup.
     attr_accessor :password
-    # @return [String] Confirmation of {#password} (virtual attribute).
-    attr_accessor :password_confirmation
     # @return [String] Virtual attribute containing the User's primary email
     #   address.
     attr_accessor :email_address
 
-    attr_accessible :username, :password, :password_confirmation,
-                    :email_address, :first_name, :last_name, as: :user
     attr_readonly :username
 
     has_metadata_column(
@@ -83,7 +79,7 @@ def encrypt(password)
   end
 
   def create_primary_email
-    emails.create!({email: email_address, primary: true}, as: :system)
+    emails.create!(email: email_address, primary: true)
   end
 
   def email_address_unique
diff --git a/app/models/blame.rb b/app/models/blame.rb
index c3721bd8..b564e2f3 100644
--- a/app/models/blame.rb
+++ b/app/models/blame.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-# The cached result of a `git-blame` operation. The {Blamer} uses this table as
-# a write-through cache of these results by means of {Blamer::Cache}.
+# The cached result of a `git-blame` operation. Some blamers use this table as a
+# write-through cache of these results by means of {Blamer::Cache}.
 #
 # Properties
 # ----------
@@ -30,7 +30,7 @@ class Blame < ActiveRecord::Base
   validates :repository_hash, :revision, :blamed_revision,
             presence: true,
             length:   {is: 40},
-            format:   {with: /[0-9a-f]+/}
+            format:   {with: /\A[0-9a-f]+\z/}
   validates :file,
             presence: true,
             length:   {maximum: 255}
diff --git a/app/models/bug.rb b/app/models/bug.rb
index 07848794..0de1b1c0 100644
--- a/app/models/bug.rb
+++ b/app/models/bug.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -96,6 +96,9 @@
 # | `special_file`         | If `true`, the `file` property has a special value (e.g., a function address), as does `line`.       |
 # | `jira_issue`           | The key of a linked JIRA issue, such as "PROJ-123".                                                  |
 # | `jira_status_id`       | The ID value of the status field of the JIRA issue that should automatically resolve this Bug.       |
+# | `page_threshold`       | Will notify PagerDuty any time this bug occurs this many times within a given period..               |
+# | `page_period`          | Will notify PagerDuty any time this bug occurs a given number of times within this period (seconds). |
+# | `page_last_tripped_at` | The last time PagerDuty was notified due to `page_threshold` being exceeded.                         |
 
 class Bug < ActiveRecord::Base
   belongs_to :environment, inverse_of: :bugs
@@ -123,13 +126,6 @@ class Bug < ActiveRecord::Base
   # @private
   attr_accessor :duplicate_of_number
 
-  attr_accessible :assigned_user, :resolution_revision, :fixed, :fix_deployed,
-                  :irrelevant, :duplicate_of, :duplicate_of_id, :jira_isssue,
-                  :jira_status_id, as: [:owner, :admin, :member]
-  attr_protected :number, :first_occurrence, :latest_occurrence,
-                 :occurrences_count, :comments_count, :assigned_user,
-                 :resolution_revision, :fixed, :irrelevant, :jira_issue,
-                 as: :worker
   attr_readonly :environment, :number, :first_occurrence, :latest_occurrence,
                 :occurrences_count, :comments_count, :class_name,
                 :message_template, :revision, :file, :line, :blamed_revision
@@ -143,7 +139,11 @@ class Bug < ActiveRecord::Base
       special_file:         {type: Boolean, default: false, allow_nil: false},
 
       jira_issue:           {type: String, allow_nil: true},
-      jira_status_id:       {type: Fixnum, allow_nil: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}}
+      jira_status_id:       {type: Fixnum, allow_nil: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}},
+
+      page_threshold:       {type: Fixnum, numericality: {greater_than: 0}, allow_nil: true},
+      page_period:          {type: Fixnum, numericality: {greater_than: 0}, allow_nil: true},
+      page_last_tripped_at: {type: Time, allow_nil: true}
   )
 
   validates :environment,
@@ -159,12 +159,12 @@ class Bug < ActiveRecord::Base
             numericality: {only_integer: true, greater_than: 0}
   validates :blamed_revision, :resolution_revision,
             length:    {is: 40},
-            format:    {with: /[0-9a-f]+/},
+            format:    {with: /\A[0-9a-f]+\z/},
             allow_nil: true
   validates :revision,
             presence: true,
             length:   {is: 40},
-            format:   {with: /[0-9a-f]+/}
+            format:   {with: /\A[0-9a-f]+\z/}
   #validates :first_occurrence,
   #          presence: true
   #validates :latest_occurrence,
@@ -289,15 +289,14 @@ def blamed_users
 
     # second priority is matching a project member by commit author(s)
     emails = emails_from_commit_author.map do |em|
-      Email.primary.by_email(find_responsible_user(em)).first ||
-          Email.new({email: em}, as: :system)
+      Email.primary.by_email(find_responsible_user(em)).first || Email.new(email: em)
       # build a fake empty email object to stand in for emails not linked to known user accounts
     end if emails.empty?
 
     # third priority is unknown emails associated with the commit itself (if the project is so configured)
     if emails.empty? && environment.project.sends_emails_outside_team?
       # build a fake empty email object to stand in for emails not linked to known user accounts
-      emails = all_emails.map { |em| Email.new({email: em}, as: :system) }
+      emails = all_emails.map { |em| Email.new(email: em) }
       if environment.project.trusted_email_domain
         emails.select! { |em| em.email.split('@').last == environment.project.trusted_email_domain }
       end
@@ -314,7 +313,7 @@ def library_file?
   end
 
   # @private
-  def to_param() number end
+  def to_param() number.to_s end
 
   # @return [String] Localized, human-readable name. This duck-types this class
   #   for use with breadcrumbs.
@@ -365,9 +364,9 @@ def index_for_search!
     comment_text = comments.map(&:body).compact.join(' ')
     self.class.connection.execute <<-SQL
         UPDATE bugs
-          SET searchable_text = SETWEIGHT(TO_TSVECTOR(#{connection.quote(class_name || '')}), 'A') ||
-            SETWEIGHT(TO_TSVECTOR(#{connection.quote(message_text || '')}), 'B') ||
-            SETWEIGHT(TO_TSVECTOR(#{connection.quote(comment_text || '')}), 'C')
+          SET searchable_text = SETWEIGHT(TO_TSVECTOR(#{self.class.connection.quote(class_name || '')}), 'A') ||
+            SETWEIGHT(TO_TSVECTOR(#{self.class.connection.quote(message_text || '')}), 'B') ||
+            SETWEIGHT(TO_TSVECTOR(#{self.class.connection.quote(comment_text || '')}), 'C')
           WHERE id = #{id}
     SQL
   end
@@ -378,6 +377,16 @@ def pagerduty_incident_key
     "Squash:Bug:#{id}"
   end
 
+  # @return [true, false] Whether or not this Bug has occurred `page_threshold`
+  #   times in the past `page_period` seconds.
+
+  def page_threshold_tripped?
+    return false unless page_threshold && page_period
+
+    (page_last_tripped_at.nil? || page_last_tripped_at < page_period.seconds.ago) &&
+        occurrences.where('occurred_at >= ?', page_period.seconds.ago).count >= page_threshold
+  end
+
   private
 
   # warning: this can get slow. always returns valid primary emails
@@ -424,7 +433,7 @@ def find_responsible_user(email, history=[])
   end
 
   def cannot_be_duplicate_of_duplicate
-    errors.add(:duplicate_of_id, :is_a_duplicate) if duplicate_of.try(:duplicate?)
+    errors.add(:duplicate_of_id, :is_a_duplicate) if duplicate_of.try!(:duplicate?)
   end
 
   def cannot_change_original_to_duplicate
diff --git a/app/models/comment.rb b/app/models/comment.rb
index ba7b8491..9a0eff6e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -49,7 +49,6 @@ class Comment < ActiveRecord::Base
   belongs_to :user, inverse_of: :comments
   belongs_to :bug, inverse_of: :comments
 
-  attr_accessible :body, as: [:creator, :owner, :admin]
   attr_readonly :user, :bug, :number
 
   include HasMetadataColumn
@@ -70,7 +69,7 @@ class Comment < ActiveRecord::Base
   after_save { |comment| comment.bug.index_for_search! }
 
   # @private
-  def to_param() number end
+  def to_param() number.to_s end
 
   # @private
   def as_json(options=nil)
diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index c3271c1b..40a4fb1b 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -64,8 +64,6 @@ class Deploy < ActiveRecord::Base
   has_many :bugs, inverse_of: :deploy, dependent: :nullify
   has_one :obfuscation_map, inverse_of: :deploy, dependent: :destroy
 
-  attr_accessible :revision, :deployed_at, :hostname, :build, :version,
-                  as: :worker
   attr_readonly :environment, :revision, :build, :hostname, :deployed_at,
                 :version
 
@@ -93,8 +91,8 @@ class Deploy < ActiveRecord::Base
   end
   set_nil_if_blank :hostname, :build
 
-  scope :builds, where('build IS NOT NULL')
-  scope :by_time, order('deployed_at DESC')
+  scope :builds, -> { where('build IS NOT NULL') }
+  scope :by_time, -> { order('deployed_at DESC') }
 
   # @return [Git::Object::Commit] The Commit for this Deploy's `revision`.
   def commit() environment.project.repo.object revision end
@@ -112,6 +110,6 @@ def to_json(options={})
   end
 
   def devices_affected
-    DeviceBug.joins(:bug).where(bugs: {deploy_id: id}).count(:device_id, distinct: true)
+    DeviceBug.joins(:bug).where(bugs: {deploy_id: id}).distinct.count(:device_id)
   end
 end
diff --git a/app/models/device_bug.rb b/app/models/device_bug.rb
index c3b029e6..a2468c91 100644
--- a/app/models/device_bug.rb
+++ b/app/models/device_bug.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/models/email.rb b/app/models/email.rb
index df791794..a904fc13 100644
--- a/app/models/email.rb
+++ b/app/models/email.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -71,15 +71,13 @@ class Email < ActiveRecord::Base
   after_save :one_primary_email_per_user
   after_save :delete_locally_redirected_emails, if: :global?
 
-  attr_accessible :email, :primary, as: :system
-  attr_accessible :email, as: :user
   attr_readonly :email
 
   scope :by_email, ->(email) { email ? where('LOWER(email) = ?', email.downcase) : where('FALSE') }
-  scope :global, where(project_id: nil)
-  scope :project_specific, where('project_id IS NOT NULL')
-  scope :primary, where(primary: true)
-  scope :redirected, where(primary: false)
+  scope :global, -> { where(project_id: nil) }
+  scope :project_specific, -> { where('project_id IS NOT NULL') }
+  scope :primary, -> { where(primary: true) }
+  scope :redirected, -> { where(primary: false) }
 
   # @return [User, nil] The User whose primary email is this email address, or
   #   `nil` if this is a primary email, or if no User has this email as his/her
@@ -87,7 +85,7 @@ class Email < ActiveRecord::Base
 
   def source
     return nil if primary?
-    return Email.primary.by_email(email).first.try(:user)
+    return Email.primary.by_email(email).first.try!(:user)
   end
 
   # @return [true, false] `true` if this is a global email redirection, or
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 9e4b61b1..3e029e14 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -56,8 +56,6 @@ class Environment < ActiveRecord::Base
       notifies_pagerduty: {type: Boolean, default: true}
   )
 
-  attr_accessible :sends_emails, :notifies_pagerduty, as: :admin
-  attr_accessible :name, as: :worker
   attr_readonly :project, :name
 
   validates :project,
@@ -66,7 +64,7 @@ class Environment < ActiveRecord::Base
             presence:   true,
             length:     {maximum: 100},
             uniqueness: {case_sensitive: false, scope: :project_id},
-            format:     {with: /[a-z0-9\-_]+/}
+            format:     {with: /\A[a-zA-Z0-9\-_]+\z/}
 
   scope :with_name, ->(name) { where("LOWER(name) = ?", name.downcase) }
 
diff --git a/app/models/event.rb b/app/models/event.rb
index bf2f548d..93a01244 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ def self.preload(events)
     end
     events.select { |e| e.data['occurrence_id'].nil? }.each { |e| e.instance_variable_set :@occurrence, [nil] }
 
-    assignees = User.where(id: (events.map { |e| e.data['assignee_id'] } + events.map { |e| e.comment.try(:user_id)}).uniq.compact).includes(:emails)
+    assignees = User.where(id: (events.map { |e| e.data['assignee_id'] } + events.map { |e| e.comment.try!(:user_id)}).uniq.compact).includes(:emails)
     assignees.each do |user|
       events.select { |e| e.data['assignee_id'] == user.id }.each { |e| e.instance_variable_set :@assignee, [user] }
     end
diff --git a/app/models/membership.rb b/app/models/membership.rb
index b9a24a87..a2b585dd 100644
--- a/app/models/membership.rb
+++ b/app/models/membership.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -50,10 +50,6 @@ class Membership < ActiveRecord::Base
   belongs_to :user, inverse_of: :memberships
   belongs_to :project, inverse_of: :memberships
 
-  attr_accessible :user, :user_id, as: :admin
-  attr_accessible :user, :user_id, :admin, as: [:owner, :system]
-  attr_accessible :send_assignment_emails, :send_comment_emails,
-                  :send_resolution_emails, as: :user
   attr_readonly :user, :project
 
   include HasMetadataColumn
diff --git a/app/models/notification_threshold.rb b/app/models/notification_threshold.rb
index 7222942f..f483bba3 100644
--- a/app/models/notification_threshold.rb
+++ b/app/models/notification_threshold.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -54,13 +54,11 @@ class NotificationThreshold < ActiveRecord::Base
             presence:     true,
             numericality: {greater_than: 0, only_integer: true}
 
-  attr_accessible :threshold, :period, as: :user
-
   # @return [true, false] Whether or not this Bug has occurred `threshold` times
   #   in the past `period` seconds.
 
   def tripped?
     (last_tripped_at.nil? || last_tripped_at < period.seconds.ago) &&
-        bug.occurrences.where("occurred_at >= ?", threshold.seconds.ago).count >= threshold
+        bug.occurrences.where('occurred_at >= ?', period.seconds.ago).count >= threshold
   end
 end
diff --git a/app/models/obfuscation_map.rb b/app/models/obfuscation_map.rb
index f5ff7b31..c12a4791 100644
--- a/app/models/obfuscation_map.rb
+++ b/app/models/obfuscation_map.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -57,7 +57,6 @@ class ObfuscationMap < ActiveRecord::Base
     BackgroundRunner.run ObfuscationMapWorker, map.id
   end
 
-  attr_accessible :namespace, as: :api
   attr_readonly :namespace
 
   # @private
diff --git a/app/models/observers/bug_observer.rb b/app/models/observers/bug_observer.rb
index 5e53ac2d..1bff788f 100644
--- a/app/models/observers/bug_observer.rb
+++ b/app/models/observers/bug_observer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -64,13 +64,12 @@ def create_dupe_event(bug)
   end
 
   def create_close_event(bug)
-    modifier_data = case bug.modifier
-                      when User
-                        {user: bug.modifier}
-                      when JIRA::Resource::Issue
-                        {data: {'issue' => bug.modifier.key}}
-                      else
-                        {}
+    modifier_data = if bug.modifier.kind_of?(User)
+                      {user: bug.modifier}
+                    elsif defined?(JIRA::Resource::Issue) && bug.modifier.kind_of?(JIRA::Resource::Issue)
+                      {data: {'issue' => bug.modifier.key}}
+                    else
+                      {}
                     end
 
     if bug.fixed? && !bug.fixed_was
@@ -82,7 +81,7 @@ def create_close_event(bug)
 
   def create_deploy_event(bug)
     if bug.fixed? && bug.fix_deployed? && !bug.fix_deployed_was
-      Event.create! bug: bug, kind: 'deploy', data: {'revision' => bug.fixing_deploy.try(:revision)}
+      Event.create! bug: bug, kind: 'deploy', data: {'revision' => bug.fixing_deploy.try!(:revision)}
     end
   end
 
@@ -94,7 +93,9 @@ def create_reopen_event(bug)
     if !bug.fixed? && bug.fixed_was && !bug.irrelevant?
       attrs[:data]['from'] = 'fixed'
       Event.create! attrs
-      NotificationMailer.deliver :reopened, bug unless bug.modifier.kind_of?(User)
+      Squash::Ruby.fail_silently do
+        NotificationMailer.reopened(bug).deliver_now unless bug.modifier.kind_of?(User)
+      end
     elsif !bug.fixed? && !bug.irrelevant? && bug.irrelevant_was
       attrs[:data]['from'] = 'irrelevant'
       Event.create! attrs
@@ -102,8 +103,10 @@ def create_reopen_event(bug)
   end
 
   def send_create_emails(bug)
-    NotificationMailer.deliver :initial, bug
-    NotificationMailer.deliver(:blame, bug) if bug.blamed_commit
+    Squash::Ruby.fail_silently do
+      NotificationMailer.initial(bug).deliver_now
+      NotificationMailer.blame(bug).deliver_now if bug.blamed_commit
+    end
   end
 
   def send_update_emails(bug)
@@ -122,14 +125,10 @@ def notify_pagerduty(bug)
     return unless bug.environment.notifies_pagerduty?
     return unless bug.environment.project.pagerduty
 
-    au = bug.previous_changes['assigned_user_id'] || []
-    ir = bug.previous_changes['irrelevant'] || []
-    if (!au.first && au.last) || (!ir.first && ir.last)
-      BackgroundRunner.run PagerDutyAcknowledger, bug.id
-    end
-
+    au  = bug.previous_changes['assigned_user_id'] || []
+    ir  = bug.previous_changes['irrelevant'] || []
     res = bug.previous_changes['fixed'] || []
-    if !res.first && res.last
+    if (!au.first && au.last) || (!ir.first && ir.last) || (!res.first && res.last)
       BackgroundRunner.run PagerDutyAcknowledger, bug.id
     end
 
diff --git a/app/models/observers/comment_observer.rb b/app/models/observers/comment_observer.rb
index e263cdd8..e3a6226a 100644
--- a/app/models/observers/comment_observer.rb
+++ b/app/models/observers/comment_observer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -30,7 +30,12 @@ def after_commit_on_create(comment)
   private
 
   def create_event(comment)
-    Event.create! bug_id: comment.bug_id, kind: 'comment', data: {'comment_id' => comment.id}, user_id: comment.user_id
+    Event.create! do |event|
+      event.bug_id  = comment.bug_id
+      event.kind    = 'comment'
+      event.data    = {'comment_id' => comment.id}
+      event.user_id = comment.user_id
+    end
   end
 
   def watch_bug(comment)
diff --git a/app/models/observers/deploy_observer.rb b/app/models/observers/deploy_observer.rb
index 4db899b6..3ec7ff82 100644
--- a/app/models/observers/deploy_observer.rb
+++ b/app/models/observers/deploy_observer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/models/observers/event_observer.rb b/app/models/observers/event_observer.rb
index 6844fcc1..569a3f03 100644
--- a/app/models/observers/event_observer.rb
+++ b/app/models/observers/event_observer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -42,7 +42,10 @@ def send_emails(event)
     if event.kind == 'assign' &&
         !event.bug.fixed? && !event.bug.irrelevant? &&
         event.user && event.assignee && event.user != event.assignee
-      NotificationMailer.deliver :assign, event.bug, event.user, event.assignee
+
+      Squash::Ruby.fail_silently do
+        NotificationMailer.assign(event.bug, event.user, event.assignee).deliver_now
+      end
     end
 
     if event.kind == 'close' &&
@@ -50,7 +53,9 @@ def send_emails(event)
         (!event.user_id && event.bug.assigned_user_id)) &&                 # or no user performed the action but there is an assigned user
         !(event.data['status'] == 'fixed' && event.bug.irrelevant?) &&     # an irrelevant bug was not marked as fixed
         !(event.data['status'] == 'irrelevant' && event.bug.fixed?)        # a fixed bug was not marked as irrelevant
-      NotificationMailer.deliver :resolved, event.bug, event.user
+      Squash::Ruby.fail_silently do
+        NotificationMailer.resolved(event.bug, event.user).deliver_now
+      end
     end
   end
 end
diff --git a/app/models/observers/occurrence_observer.rb b/app/models/observers/occurrence_observer.rb
index 0eaf307e..786088d0 100644
--- a/app/models/observers/occurrence_observer.rb
+++ b/app/models/observers/occurrence_observer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/models/observers/watch_observer.rb b/app/models/observers/watch_observer.rb
index b8aa023d..6cfa978d 100644
--- a/app/models/observers/watch_observer.rb
+++ b/app/models/observers/watch_observer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb
index 20d075eb..820218f2 100644
--- a/app/models/occurrence.rb
+++ b/app/models/occurrence.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -73,15 +73,16 @@
 # trace return address. Unsymbolicated backtrace lines can be symbolicated by
 # calling {#symbolicate}, assuming an appropriate {Symbolication} is available.
 #
-# For un-sourcemapped JavaScript lines, the `type` field will be **minified**
-# and the other fields will be:
+# For un-sourcemapped JavaScript lines, the `type` field will start with **js:**
+# (the type depends on the stage of the JavaScript [hosted, concatenated,
+# compiled, etc.]), and the other fields will be:
 #
 # |           |                                                                    |
 # |:----------|:-------------------------------------------------------------------|
-# | `url`     | The URL of the minified JavaScript asset.                          |
-# | `line`    | The line number in the minified file.                              |
-# | `column`  | The column number in the minified file.                            |
-# | `symbol`  | The minified method or function name.                              |
+# | `url`     | The URL of the compiled JavaScript asset.                          |
+# | `line`    | The line number in the compiled file.                              |
+# | `column`  | The column number in the compiled file.                            |
+# | `symbol`  | The compiled method or function name.                              |
 # | `context` | An array of strings containing the lines of code around the error. |
 #
 # Some elements will be `nil` depending on browser support. Un-sourcemapped
@@ -378,8 +379,6 @@ class Occurrence < ActiveRecord::Base
   belongs_to :redirect_target, class_name: 'Occurrence', foreign_key: 'redirect_target_id', inverse_of: :redirected_occurrence
   has_one :redirected_occurrence, class_name: 'Occurrence', foreign_key: 'redirect_target_id', inverse_of: :redirect_target, dependent: :destroy
 
-  attr_readonly :bug, :revision, :number, :occurred_at
-
   include HasMetadataColumn
   has_metadata_column(
       # Universal
@@ -431,7 +430,7 @@ class Occurrence < ActiveRecord::Base
       orientation:            {length: {maximum: 100}, allow_nil: true},
 
       # HTTP
-      request_method:         {inclusion: {in: %w( GET POST PUT PATCH DELETE HEAD TRACE OPTIONS CONNECT )}, allow_nil: true},
+      request_method:         {length: {maximum: 50}, allow_nil: true},
       schema:                 {length: {maximum: 50}, allow_nil: true},
       host:                   {length: {maximum: 255}, allow_nil: true},
       port:                   {type: Fixnum, allow_nil: true},
@@ -466,6 +465,8 @@ class Occurrence < ActiveRecord::Base
       color_depth:            {type: Integer, allow_nil: true}
   )
 
+  attr_readonly :bug, :revision, :number, :occurred_at
+
   # Fields that cannot be used by the aggregation view. These are fields with a
   # a continuous range of possible values, or fields with unusual data types.
   NON_AGGREGATING_FIELDS = %w( number message backtraces ivars arguments env_vars
@@ -475,14 +476,14 @@ class Occurrence < ActiveRecord::Base
                                user_id occurred_at root symbolication_id
                                redirect_target_id )
   # Fields that can be used by the aggregation view.
-  AGGREGATING_FIELDS = (Occurrence.columns.map(&:name) rescue []) + Occurrence.metadata_column_fields.keys.map(&:to_s) - NON_AGGREGATING_FIELDS
+  AGGREGATING_FIELDS     = (Occurrence.columns.map(&:name) rescue []) + Occurrence.metadata_column_fields.keys.map(&:to_s) - NON_AGGREGATING_FIELDS
 
   validates :bug,
             presence: true
   validates :revision,
             presence: true,
             length:   {is: 40},
-            format:   {with: /[0-9a-f]+/}
+            format:   {with: /\A[0-9a-f]+\z/}
   #validates :number,
   #          presence:     true,
   #          numericality: {only_integer: true, greater_than: 0},
@@ -498,7 +499,9 @@ class Occurrence < ActiveRecord::Base
                    :browser_engine, :browser_os, :browser_engine_version
   before_validation(on: :create) { |obj| obj.revision = obj.revision.downcase if obj.revision }
   after_create :reload # grab the number value after the rule has been run
+  before_create :sourcemap
   before_create :symbolicate
+  before_create :deobfuscate
 
   # @return [URI::Generic] The URL of the Web request that resulted in this
   #   Occurrence.
@@ -508,6 +511,8 @@ def url
       return nil unless web?
       return nil unless URI.scheme_list.include?(schema.upcase)
       URI.scheme_list[schema.upcase].build(host: host, port: port, path: path, query: query, fragment: fragment)
+    rescue URI::InvalidComponentError
+      nil
     end
   end
 
@@ -549,7 +554,7 @@ def web?
   #   request information.
 
   def request?
-    params? && headers?
+    params? || headers?
   end
 
   # @return [true, false] Whether or not this Occurrence has Rails information.
@@ -615,7 +620,7 @@ def screen?
   end
 
   # @private
-  def to_param() number end
+  def to_param() number.to_s end
 
   # @return [String] Localized, human-readable name. This duck-types this class
   #   for use with breadcrumbs.
@@ -720,11 +725,8 @@ def symbolicated?
 
   # @overload sourcemap(source_map, ...)
   #   Apply one or more source maps to this Occurrence's backtrace. Any matching
-  #   un-sourcemapped lines will be converted. Source maps will be run in the
-  #   order they are provided: If you have, e.g., a source map that converts
-  #   minified JavaScript to JavaScript, and one that converts JavaScript to
-  #   CoffeeScript, you should place the former source map earlier in the list
-  #   than the latter.
+  #   un-sourcemapped lines will be converted. Source maps will be searched and
+  #   applied in until no further lines can be converted (see {SourceMap}).
   #
   #   Does not save the record.
   #
@@ -737,13 +739,58 @@ def sourcemap(*sourcemaps)
 
     sourcemaps = bug.environment.source_maps.where(revision: revision) if sourcemaps.empty?
     return if sourcemaps.empty?
+    sourcemaps = sourcemaps.group_by(&:from)
 
     (bt = backtraces).each do |bt|
       bt['backtrace'].each do |elem|
-        next unless elem['type'] == 'minified'
-        symbolicated = nil
-        sourcemaps.each { |map| symbolicated ||= map.resolve(elem['url'], elem['line'], elem['column']) }
-        elem.replace(symbolicated) if symbolicated
+        found_at_least_one_applicable_sourcemap = true
+        # repeat until there's no more sourcemapping we can do on this line
+        while found_at_least_one_applicable_sourcemap
+          # assume we haven't found one
+          found_at_least_one_applicable_sourcemap = false
+          next unless elem['type'].start_with?('js:')
+
+          type         = elem['type'][3..-1]
+          # try every valid source map on this line
+          sourcemapped = nil
+          Array.wrap(sourcemaps[type]).each do |map|
+            file         = (map.from == 'hosted' ? elem['url'] : elem['file'])
+            sourcemapped = map.resolve(file, elem['line'], elem['column'])
+
+            if sourcemapped
+              sourcemapped['type'] = "js:#{map.to}"
+              # stop when we find one that applies
+              break
+            end
+          end
+
+          if !sourcemapped && elem['type'] == 'js:hosted' && bug.environment.project.digest_in_asset_names?
+            # It's possible the most recent version of this asset was generated
+            # in a previous deploy. Search all source maps for one that can
+            # resolve our file name.
+            if (matching_sourcemap = bug.environment.source_maps.where(filename: elem['url'], from: 'hosted').first)
+              sourcemapped = matching_sourcemap.resolve(elem['url'], elem['line'], elem['column'])
+              if sourcemapped
+                sourcemapped['type'] = "js:#{matching_sourcemap.to}"
+
+                # Since this digest was generated in a previous deploy, we need
+                # to add all the sourcemaps generated in that deploy to our list
+                sourcemaps.merge! bug.environment.source_maps.where(revision: matching_sourcemap.revision).group_by(&:from)
+              end
+            end
+          end
+
+          # if we found one that applies
+          if sourcemapped
+            # change the backtrace
+            elem.replace sourcemapped
+            # and make sure we try sourcemapping the line again
+            found_at_least_one_applicable_sourcemap = true
+          end
+        end
+
+        # clear out the type if we were able to sourcemap at least once
+        elem.delete('type') if elem['type'] != 'js:hosted'
       end
     end
     self.backtraces = bt # refresh the actual JSON
@@ -768,7 +815,7 @@ def sourcemap!(*sourcemaps)
   def sourcemapped?
     return true if truncated?
     backtraces.all? do |bt|
-      bt['backtrace'].none? { |elem| elem['type'] == 'minified' }
+      bt['backtrace'].none? { |elem| elem['type'] && elem['type'] == 'js:hosted' }
     end
   end
 
@@ -780,7 +827,7 @@ def sourcemapped?
   # @see #deobfuscate!
 
   def deobfuscate(map=nil)
-    map ||= bug.deploy.obfuscation_map
+    map ||= bug.deploy.try!(:obfuscation_map)
 
     return unless map
     return if truncated?
@@ -795,7 +842,7 @@ def deobfuscate(map=nil)
         elem.replace(
             'file'   => klass.path,
             'line'   => elem['line'],
-            'symbol' => meth.try(:full_name) || elem['symbol']
+            'symbol' => meth.try!(:full_name) || elem['symbol']
         )
       end
     end
@@ -808,7 +855,7 @@ def deobfuscate(map=nil)
   #   linked Deploy's ObfuscationMap).
 
   def deobfuscate!(map=nil)
-    map ||= bug.deploy.try(:obfuscation_map)
+    map ||= bug.deploy.try!(:obfuscation_map)
 
     return unless map
     return if truncated?
@@ -834,11 +881,11 @@ def deobfuscated?
   # Saves the record.
 
   def recategorize!
-    blamer = Blamer.new(self)
-    new_bug    = blamer.find_or_create_bug!
+    blamer  = bug.environment.project.blamer.new(self)
+    new_bug = blamer.find_or_create_bug!
     if new_bug.id != bug_id
-      copy            = new_bug.occurrences.build
-      copy.attributes = attributes.except('number', 'id', 'bug_id')
+      copy = new_bug.occurrences.build
+      copy.assign_attributes attributes.except('number', 'id', 'bug_id')
       copy.save!
       blamer.reopen_bug_if_necessary! new_bug
       redirect_to! copy
@@ -897,7 +944,7 @@ def self.convert_legacy_backtrace_format(backtrace)
             }
           when '_JS_ASSET_'
             {
-                'type'    => 'minified',
+                'type'    => 'js:hosted',
                 'url'     => bt_line[1],
                 'line'    => bt_line[2],
                 'column'  => bt_line[3],
diff --git a/app/models/project.rb b/app/models/project.rb
index 9331c9ba..625f8526 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@
 # | `uses_releases`             | If `true`, bug views will be segregated by release, and release data will be displayed. Automatically set to true if any Deploys with release data are received. |
 # | `uses_releases_override`    | `uses_releases` is set automatically. If the user has set the value at least once manually, this is `true`, and automatic updates are suppressed.                |
 # | `disable_message_filtering` | If `true`, Bug messages are not filtered for potentially sensitive information.                                                                                  |
+# | `blamer_type`               | The name of a subclass of {Blamer::Base} that will be used to perform the blame operation.                                                                       |
 #
 # Code configuration
 # ------------------
@@ -88,6 +89,13 @@
 # | `pagerduty_enabled`       | If `true`, new Occurrences are sent to PagerDuty. Note that PagerDuty "acknowledge" and "resolve" events are sent regardless of this value. |
 # | `pagerduty_service_key`   | The service key assigned to this project by PagerDuty.                                                                                      |
 # | `always_notify_pagerduty` | If `true`, all new Bugs are sent to PagerDuty. If `false`, only those Bugs that exceed the critical threshold are sent.                     |
+#
+# Source-Mapping
+# --------------
+#
+# |                         |                                                                                                                                                                                                                                                                                                                  |
+# |:------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+# | `digest_in_asset_names` | If `true`, it is assumed that this application uniquely names its JavaScript assets. This allows Squash to search more than just the current revision's source maps when locating one matching an asset name, and allows the application to only upload new source maps when a JavaScript file actually changes. |
 
 class Project < ActiveRecord::Base
   # The directory where repositories are checked out.
@@ -107,23 +115,6 @@ class Project < ActiveRecord::Base
   has_many :members, through: :memberships, source: :user
   has_many :emails, inverse_of: :project, dependent: :delete_all
 
-  attr_accessible :name, :repository_url, :default_environment,
-                  :default_environment_id, :filter_paths, :whitelist_paths,
-                  :commit_url_format, :critical_mailing_list, :all_mailing_list,
-                  :critical_threshold, :sender, :locale,
-                  :sends_emails_outside_team, :trusted_email_domain,
-                  :pagerduty_enabled, :pagerduty_service_key,
-                  :always_notify_pagerduty, :uses_releases,
-                  :disable_message_filtering, as: :admin
-  attr_accessible :name, :repository_url, :default_environment,
-                  :default_environment_id, :filter_paths, :whitelist_paths,
-                  :commit_url_format, :critical_mailing_list, :all_mailing_list,
-                  :critical_threshold, :sender, :locale, :owner, :owner_id,
-                  :validate_repo_connectivity, :sends_emails_outside_team,
-                  :trusted_email_domain, :pagerduty_enabled,
-                  :pagerduty_service_key, :always_notify_pagerduty,
-                  :uses_releases, :disable_message_filtering, as: :owner
-
   include Slugalicious
   slugged :name
 
@@ -148,7 +139,10 @@ class Project < ActiveRecord::Base
       uses_releases:             {type: Boolean, default: false},
       uses_releases_override:    {type: Boolean, default: false},
 
-      disable_message_filtering: {type: Boolean, default: false}
+      disable_message_filtering: {type: Boolean, default: false},
+      blamer_type:               {presence: true, default: 'Blamer::Recency'},
+
+      digest_in_asset_names:     {type: Boolean, default: true}
   )
 
   validates :owner,
@@ -173,8 +167,8 @@ class Project < ActiveRecord::Base
                    :pagerduty_service_key
 
   after_save do |obj|
-    obj.memberships.where(user_id: obj.owner_id).create_or_update!({admin: true}, as: :system) if owner_id_changed?
-    obj.memberships.where(user_id: obj.owner_id_was).create_or_update!({admin: true}, as: :system) if owner_id_was
+    obj.memberships.where(user_id: obj.owner_id).create_or_update!(admin: true) if owner_id_changed?
+    obj.memberships.where(user_id: obj.owner_id_was).create_or_update!(admin: true) if owner_id_was
   end
   before_validation :set_commit_url_format
 
@@ -272,6 +266,13 @@ def pagerduty
     @pagerduty ||= (pagerduty_service_key? ? Service::PagerDuty.new(pagerduty_service_key) : nil)
   end
 
+  # @return [Class] The subclass of {Blamer::Base} that will be used to perform
+  #   the blame operation for this Project's Occurrences.
+
+  def blamer
+    blamer_type.constantize
+  end
+
   # @private
   def repository_hash
     Digest::SHA1.hexdigest(repository_url)
@@ -306,7 +307,9 @@ def set_commit_url_format
   end
 
   def can_clone_repo
-    errors.add(:repository_url, :unreachable) unless repo
+    unless system('git', 'ls-remote', repository_url, out: '/dev/null', err: '/dev/null')
+      errors.add :repository_url, :unreachable
+    end
   end
 
   def repo_mutex
diff --git a/app/models/slug.rb b/app/models/slug.rb
index 9311ea27..351fca08 100644
--- a/app/models/slug.rb
+++ b/app/models/slug.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -47,8 +47,8 @@ class Slug < ActiveRecord::Base
   scope :from_slug, ->(klass, scope, slug) {
     where(sluggable_type: klass.to_s, slug: slug, scope: scope)
   }
-  scope :active, where(active: true)
-  scope :inactive, where(active: false)
+  scope :active, -> { where(active: true) }
+  scope :inactive, -> { where(active: false) }
 
   validates :sluggable_type,
             presence: true
diff --git a/app/models/source_map.rb b/app/models/source_map.rb
index d901f3ae..2ded7865 100644
--- a/app/models/source_map.rb
+++ b/app/models/source_map.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,9 +13,8 @@
 #    limitations under the License.
 
 # Source mapping information for a JavaScript project. This model stores a
-# mapping of minified JavaScript code location and symbol names to
-# corresponding location and names in the unminified code. It also maps asset
-# URLs to the project files those URLs are generated from. See the Squash
+# mapping of generated JavaScript code location and symbol names to
+# corresponding location and names in the original code. See the Squash
 # JavaScript client library documentation for more information.
 #
 # Even if your project is not using minified code, this class is also useful for
@@ -27,13 +26,55 @@
 # a memory representation of the source map. The gem is also included in this
 # project to support deserializing the resulting data.
 #
-# Serialization is accomplished by YAML-serializing the
-# `Squash::Javascript::SourceMap` object, zlib-encoding the result, and then
+# Serialization is accomplished by zlib-encoding the JSON source map, and then
 # base-64-encoding the compressed output. This is also how the `map` property is
 # transmitted over the wire.
 #
 # No support is given for modifying these objects after they have been
-# deserialized from YAML.
+# deserialized.
+#
+# ### Source maps in stages
+#
+# Oftentimes a project's JavaScript code moves through different transformations
+# before reaching a final deployed state. For example, the development code
+# could be in CoffeeScript, which is then compiled to JavaScript, then
+# concatenated, then minified (a three-stage process). The client may generate
+# source maps for each of those stages.
+#
+# In order to convert a stack trace from its original format into one useful in
+# the development code, these source maps must be applied in the correct order.
+# To facilitate this, SourceMap records have a `from` and `to` field. Stack
+# traces are annotated with their production format ("hosted"), and Squash
+# searches for source maps that it can apply to that format. It continues to
+# search for applicable source maps until the stack trace's format is not
+# convertible any further.
+#
+# Stack traces are searched in a simple linear order and applied as they are
+# found applicable. No fancy dependency trees are built.
+#
+# For example, say the following stack trace was provided:
+#
+# ````
+# 1: foo/bar.js:123 (concatenated)
+# 2. foo/baz.js:234 (hosted)
+# ````
+#
+# Squash would first note that line 1 is concatenated, and attempt to locate a
+# sourcemap whose `from` field is "concatenated" that has an entry for that file
+# and line. It would perhaps find one whose `to` field is "compiled", so it
+# would apply that source map, resulting in a different stack trace element
+# whose type is "compiled". It would then search again for another source map,
+# this time one whose `from` field was "compiled", and finding one, apply it,
+# resulting in a new stack trace of type "coffee". Finding no source maps whose
+# `from` field is "coffee", Squash would be finished with that line.
+#
+# Line two would proceed similarly, except Squash might find a source map with
+# a `from` of "hosted" and a `to` of "concatenated". From there, the logic would
+# proceed as described previously.
+#
+# The Squash JavaScript client library always adds the type of "hosted" to
+# each line of the original backtrace, so your source-mapping journey should
+# begin there.
 #
 # Associations
 # ------------
@@ -45,9 +86,12 @@
 # Properties
 # ----------
 #
-# |       |                                                                           |
-# |:------|:--------------------------------------------------------------------------|
-# | `map` | A serialized `Squash::Javascript::SourceMap` object with source map data. |
+# |        |                                                                                  |
+# |:-------|:---------------------------------------------------------------------------------|
+# | `map`  | A serialized source map.                                                         |
+# | `filename` | The name of the file this source map maps from. |
+# | `from` | An identifier indicating what kind of JavaScript code this source map maps from. |
+# | `to`   | An identifier indicating what kind of JavaScript code this source map maps to.   |
 
 class SourceMap < ActiveRecord::Base
   belongs_to :environment, inverse_of: :source_maps
@@ -57,47 +101,69 @@ class SourceMap < ActiveRecord::Base
   validates :revision,
             presence:       true,
             known_revision: {repo: ->(map) { RepoProxy.new(map, :environment, :project) }}
+  validates :from, :to,
+            presence: true,
+            length:   {maximum: 24}
+  validates :filename,
+            presence: true,
+            strict:   true
 
+  before_validation :set_filename, on: :create
   after_commit(on: :create) do |map|
     BackgroundRunner.run SourceMapWorker, map.id
   end
 
-  attr_accessible :revision, :map, as: :api
   attr_readonly :revision
 
   # @private
   def map
-    @map ||= begin
-      m = YAML.load(Zlib::Inflate.inflate(Base64.decode64(read_attribute(:map))))
-      raise TypeError, "expected Squash::Javascript::SourceMap, got #{m.class}" unless m.kind_of?(Squash::Javascript::SourceMap)
-      m
-    end
+    @map ||= GemSourceMap::Map.from_json(
+        Zlib::Inflate.inflate(
+            Base64.decode64(read_attribute(:map))))
   end
 
   # @private
   def map=(m)
-    raise TypeError, "expected Squash::Javascript::SourceMap, got #{m.class}" unless m.kind_of?(Squash::Javascript::SourceMap)
-    write_attribute :map, Base64.encode64(Zlib::Deflate.deflate(m.to_yaml))
+    raise TypeError, "expected GemSourceMap::Map, got #{m.class}" unless m.kind_of?(GemSourceMap::Map)
+    write_attribute :map, Base64.encode64(Zlib::Deflate.deflate(m.as_json.to_json))
+  end
+
+  # @private
+  def raw_map=(m)
+    write_attribute :map, m
   end
 
-  # Given a line of code within a minified file, attempts to resolve it to a
-  # line of code within the original source.
+  # Given a line of code within a file in the `from` format, attempts to resolve
+  # it to a line of code within a file in the `to` format.
   #
-  # @param [String] route The URL of the minified JavaScript file.
-  # @param [Fixnum] line The line of code.
+  # @param [String] route The URL of the generated JavaScript file.
+  # @param [Fixnum] line The line of code
   # @param [Fixnum] column The character number within the line.
   # @return [Hash, nil] If found, a hash consisting of the source file path,
   #   line number, and method name.
 
   def resolve(route, line, column)
-    if (mapping = map.resolve(route, line, column))
-      {
-          'file'   => mapping.source_file,
-          'line'   => mapping.source_line,
-          'symbol' => mapping.symbol
-      }
-    else
-      nil
+    return nil unless column # firefox doesn't support column numbers
+    return nil unless map.filename == route || begin
+      uri = URI.parse(route) rescue nil
+      if uri.kind_of?(URI::HTTP) || uri.kind_of?(URI::HTTPS)
+        uri.path == map.filename
+      else
+        false
+      end
     end
+    mapping = map.bsearch(GemSourceMap::Offset.new(line, column))
+    return nil unless mapping
+    {
+        'file'   => mapping.source,
+        'line'   => mapping.original.line,
+        'column' => mapping.original.column
+    }
+  end
+
+  private
+
+  def set_filename
+    self.filename = map.filename
   end
 end
diff --git a/app/models/symbolication.rb b/app/models/symbolication.rb
index 2ce5b280..664c1cf4 100644
--- a/app/models/symbolication.rb
+++ b/app/models/symbolication.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -56,20 +56,19 @@
 
 class Symbolication < ActiveRecord::Base
   # internal use only
-  has_many :occurrences, inverse_of: :symbolication, primary_key: 'uuid', dependent: :restrict
+  has_many :occurrences, inverse_of: :symbolication, primary_key: 'uuid', dependent: :restrict_with_exception
 
   self.primary_key = 'uuid'
 
   validates :uuid,
             presence:   true,
             uniqueness: true,
-            format:     {with: /^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/i}
+            format:     {with: /\A[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}\z/i}
 
   after_commit(on: :create) do |sym|
     BackgroundRunner.run SymbolicationWorker, sym.id
   end
 
-  attr_accessible :uuid, :symbols, :lines, as: :api
   attr_readonly :uuid
 
   # @private
diff --git a/app/models/user.rb b/app/models/user.rb
index 17f3a60d..fbba3747 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ class User < ActiveRecord::Base
   has_many :events, dependent: :nullify, inverse_of: :user
   has_many :memberships, dependent: :delete_all, inverse_of: :user
   has_many :member_projects, through: :memberships, source: :project
-  has_many :owned_projects, class_name: 'Project', foreign_key: 'owner_id', dependent: :restrict, inverse_of: :owner
+  has_many :owned_projects, class_name: 'Project', foreign_key: 'owner_id', dependent: :restrict_with_exception, inverse_of: :owner
   has_many :watches, dependent: :delete_all, inverse_of: :user
   has_many :user_events, dependent: :delete_all, inverse_of: :user
   has_many :emails, dependent: :delete_all, inverse_of: :user
@@ -78,7 +78,7 @@ class User < ActiveRecord::Base
   validates :username,
             presence:   true,
             length:     {maximum: 50},
-            format:     {with: /[a-z0-9_\-]+/},
+            format:     {with: /\A[a-z0-9_\-]+\z/},
             uniqueness: true
 
   before_validation(on: :create) { |obj| obj.username = obj.username.downcase if obj.username }
@@ -111,7 +111,7 @@ def gravatar
   end
 
   # Returns a symbol describing a user's role in relation to a model object;
-  # used for `attr_accessible` roles.
+  # used for strong attribute roles.
   #
   # @param [ActiveRecord::Base] object A model instance.
   # @return [Symbol, nil] The user's role, or `nil` if the user has no
@@ -132,7 +132,7 @@ def role(object)
         return :creator if object.user_id == id
         return :owner if object.bug.environment.project.owner_id == id
         membership = memberships.where(project_id: object.bug.environment.project_id).first
-        return :admin if membership.try(:admin?)
+        return :admin if membership.try!(:admin?)
         return nil
       else
         return nil
diff --git a/app/models/user_event.rb b/app/models/user_event.rb
index dbf60b0b..7905f5ba 100644
--- a/app/models/user_event.rb
+++ b/app/models/user_event.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/models/watch.rb b/app/models/watch.rb
index 4fba3481..520541c3 100644
--- a/app/models/watch.rb
+++ b/app/models/watch.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/views/accounts/show.html.rb b/app/views/accounts/show.html.rb
index 0c14de18..251372f4 100644
--- a/app/views/accounts/show.html.rb
+++ b/app/views/accounts/show.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/views/accounts/show.js.erb b/app/views/accounts/show.js.erb
index d5534b2b..d69cc5e1 100644
--- a/app/views/accounts/show.js.erb
+++ b/app/views/accounts/show.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ function processProjectSearchResults(query) {
           $('<button/>').attr({href: membership.project.url + '?show_environments=true#change_owner', type: 'button'}).
                   text("Change Ownership").autoButton().prependTo(li);
         else
-          $('<button/>').attr({ 'data-method': 'DELETE', href: membership.delete_url }).
+          $('<button/>').attr({ 'data-sqmethod': 'DELETE', href: membership.delete_url }).
                   addClass('warning').text("Leave Project").autoButton().prependTo(li);
         $('<strong/>').text(membership.human_role).prependTo(p);
       });
diff --git a/app/views/additions/accordion.rb b/app/views/additions/accordion.rb
index aa711246..ef4d8563 100644
--- a/app/views/additions/accordion.rb
+++ b/app/views/additions/accordion.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/views/additions/backtrace_rendering.rb b/app/views/additions/html_backtrace_rendering.rb
similarity index 94%
rename from app/views/additions/backtrace_rendering.rb
rename to app/views/additions/html_backtrace_rendering.rb
index 2707a47d..1f44b1f8 100644
--- a/app/views/additions/backtrace_rendering.rb
+++ b/app/views/additions/html_backtrace_rendering.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 #    limitations under the License.
 
 # Adds methods to a view class that allow it to render backtraces in a standard
-# style.
+# HTML style.
 
-module BacktraceRendering
+module HTMLBacktraceRendering
   protected
 
   # Renders a list of backtraces.
@@ -36,7 +36,7 @@ def render_backtraces(backtraces, identifier)
     if !@occurrence.symbolicated? && !@occurrence.symbolication
       p "Portions of the backtrace have not yet been symbolicated. If you would like a meaningful backtrace, please upload a symbolication file using your language’s client library.", class: 'alert info'
     end
-    if !@occurrence.sourcemapped? #&& !@occurrence.source_map
+    unless @occurrence.sourcemapped?
       p "Portions of the backtrace have not yet been source-mapped. If you would like a meaningful backtrace, please upload a JavaScript source map using the Squash JavaScript client library.", class: 'alert info'
     end
     unless @occurrence.deobfuscated?
@@ -87,8 +87,8 @@ def render_special_backtrace_element(element, identifier, index, lindex)
     case element['type']
       when 'address'
         li "0x#{element['address'].to_s(16).rjust(8, '0').upcase}", class: 'lib long-words'
-      when 'minified'
-        render_minified_backtrace_element element, identifier, index, lindex
+      when /^js:/
+        render_js_backtrace_element element, identifier, index, lindex
       when 'obfuscated'
         li format_backtrace_element(element['file'], element['line'], element['symbol']), class: 'lib long-words'
       when 'java_native'
@@ -104,7 +104,7 @@ def render_special_backtrace_element(element, identifier, index, lindex)
     end
   end
 
-  def render_minified_backtrace_element(element, identifier, index, lindex)
+  def render_js_backtrace_element(element, identifier, index, lindex)
     line_portion = if element['line'] && element['column'] then
                      "#{element['line']}:#{element['column']}"
                    elsif element['line'] then
@@ -146,7 +146,8 @@ def render_normal_backtrace_element(element, identifier, index, lindex)
             text! editor_link 'textmate', @project, element['file'], element['line']; br
             text! editor_link 'sublime', @project, element['file'], element['line']; br
             text! editor_link 'vim', @project, element['file'], element['line']; br
-            text! editor_link 'emacs', @project, element['file'], element['line']
+            text! editor_link 'emacs', @project, element['file'], element['line']; br
+            text! editor_link 'rubymine', @project, element['file'], element['line']
           end
           pre class: 'context', :'data-project' => @project.to_param, :'data-revision' => @occurrence.revision, :'data-file' => element['file'], :'data-line' => element['line']
         end
diff --git a/app/views/additions/text_backtrace_rendering.rb b/app/views/additions/text_backtrace_rendering.rb
new file mode 100644
index 00000000..d5238109
--- /dev/null
+++ b/app/views/additions/text_backtrace_rendering.rb
@@ -0,0 +1,80 @@
+# encoding: utf-8
+
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Adds methods to a view class that allow it to render backtraces in a standard
+# textual style.
+
+module TextBacktraceRendering
+
+  # Renders a backtrace.
+  #
+  # @param [Array] backtrace The backtrace to render, in the format used by
+  #   {Occurrence}.
+  # @return [String] The rendered backtrace.
+
+  def render_backtrace(backtrace)
+    backtrace.map { |e| render_backtrace_element(e) }.join("\n")
+  end
+
+  private
+
+  def render_backtrace_element(element)
+    if element['type'].nil?
+      render_normal_backtrace_element element
+    else
+      render_special_backtrace_element element
+    end
+  end
+
+  def render_special_backtrace_element(element)
+    case element['type']
+      when 'address'
+        "0x#{element['address'].to_s(16).rjust(8, '0').upcase}"
+      when /^js:/
+        render_js_backtrace_element element
+      when 'obfuscated'
+        format_backtrace_element element['file'], element['line'], element['symbol']
+      when 'java_native'
+        "#{element['class']}.#{element['symbol']} (native method)"
+      when 'jruby_noline'
+        format_backtrace_element element['file'], '(no line number)', element['symbol']
+      when 'jruby_block'
+        "(block in #{element['class']}##{element['symbol']})"
+      when 'asm_invoker'
+        "(ASM invoker class in #{element['file']})"
+      else
+        "(unknown backtrace format #{element['type']})"
+    end
+  end
+
+  def render_js_backtrace_element(element)
+    line_portion = if element['line'] && element['column'] then
+                     "#{element['line']}:#{element['column']}"
+                   elsif element['line'] then
+                     element['line'].to_s
+                   else
+                     nil
+                   end
+    li_text      = element['url']
+    li_text << " : " << line_portion if line_portion
+    li_text << " (in #{element['symbol']})" if element['symbol']
+    return li_text
+  end
+
+  def render_normal_backtrace_element(element)
+    format_backtrace_element element['file'], element['line'], element['method']
+  end
+end
diff --git a/app/views/bugs/index.atom.builder b/app/views/bugs/index.atom.builder
index 237a1281..11f8620f 100644
--- a/app/views/bugs/index.atom.builder
+++ b/app/views/bugs/index.atom.builder
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@ atom_feed(root_url: project_environment_bugs_url(@project, @environment)) do |fe
   feed.updated @bugs.first.first_occurrence if @bugs.any?
 
   @bugs.each do |bug|
-    feed.entry(@bug,
+    feed.entry(bug,
                published: bug.first_occurrence,
                url:       project_environment_bug_url(@project, @environment, bug),
                id:        "project:#{@project.slug},environment:#{@environment.name},bug:#{bug.number}") do |entry|
       entry.title(
-          if @bug.special_file?
+          if bug.special_file?
             "#{bug.class_name} in #{bug.file}"
           else
             "#{bug.class_name} in #{bug.file}:#{bug.line}"
diff --git a/app/views/bugs/index.html.rb b/app/views/bugs/index.html.rb
index e80d88de..4f1cd0a2 100644
--- a/app/views/bugs/index.html.rb
+++ b/app/views/bugs/index.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/views/bugs/index.js.erb b/app/views/bugs/index.js.erb
index 64c0890f..b23166d5 100644
--- a/app/views/bugs/index.js.erb
+++ b/app/views/bugs/index.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -27,10 +27,10 @@ $(document).ready(function() {
                                   { key: 'occurrences', title: "Counts", sortable: 'desc', htmlGenerator: function(bug) {
                                     var sp = $('<span/>');
                                     $('<span/>').text(bug.occurrences_count).addClass('occurrences_count').appendTo(sp);
-                                    $('<i/>').addClass('icon-exclamation-sign').appendTo(sp);
+                                    $('<i/>').addClass('fa fa-exclamation-circle').appendTo(sp);
                                     sp.append(' ');
                                     $('<span/>').text(bug.comments_count).addClass('comments_count').appendTo(sp);
-                                    $('<i/>').addClass('icon-comment').appendTo(sp);
+                                    $('<i/>').addClass('fa fa-comment').appendTo(sp);
                                     return sp;
                                   } },
                                   { key: 'latest', title: "Latest", sortable: 'desc', htmlGenerator: function(bug) {
@@ -47,7 +47,7 @@ $(document).ready(function() {
   );
 
   var refresh = function() {
-    var spinner = $('<i/>').addClass('icon-refresh').appendTo($('#filter').find('>p:first-child'));
+    var spinner = $('<i/>').addClass('fa fa-refresh').appendTo($('#filter').find('>p:first-child'));
     table.refreshData(function() { spinner.remove(); }, true);
   };
 
diff --git a/app/views/bugs/show.html.rb b/app/views/bugs/show.html.rb
index 302cf7ea..d10cead2 100644
--- a/app/views/bugs/show.html.rb
+++ b/app/views/bugs/show.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ def breadcrumbs() [@project, @environment, @bug] end
       def bug_title
         h1 do
           text @bug.class_name
-          a id: 'watch', href: '#', class: "icon-star#{'-empty' unless current_user.watches?(@bug)}", alt: "Watch/unwatch this bug"
+          a id: 'watch', href: '#', class: "fa fa-star#{'-o' unless current_user.watches?(@bug)}", alt: "Watch/unwatch this bug"
         end
       end
 
@@ -80,7 +80,7 @@ def duplicate_bar
       def uneditable_bar
         p(class: 'alert info') do
           text "You will need to "
-          a "join this project", href: join_project_my_membership_url(@project), :'data-method' => 'POST', id: 'join-link'
+          a "join this project", href: join_project_my_membership_url(@project), :'data-sqmethod' => 'POST', id: 'join-link'
           text " to edit this bug. "
         end
       end
@@ -109,7 +109,10 @@ def bug_info
       def bug_location
         p(id: 'location') do
           if @bug.special_file?
-            text "#{@bug.file} "
+            case @bug.file # TODO don't guess, record this information
+              when /^\[S\] / then text("<simple blamer> ")
+              else text("#{@bug.file} ")
+            end
           else
             text "#{@bug.file}, line #{number_with_delimiter @bug.line} "
           end
@@ -125,7 +128,8 @@ def bug_location
             text! editor_link 'textmate', @project, @bug.file, @bug.line; br
             text! editor_link 'sublime', @project, @bug.file, @bug.line; br
             text! editor_link 'vim', @project, @bug.file, @bug.line; br
-            text! editor_link 'emacs', @project, @bug.file, @bug.line
+            text! editor_link 'emacs', @project, @bug.file, @bug.line; br
+            text! editor_link 'rubymine', @project, @bug.file, @bug.line
           end
           pre class: 'context', :'data-project' => @project.to_param, :'data-revision' => @bug.revision, :'data-file' => @bug.file, :'data-line' => @bug.line
         end
@@ -140,7 +144,7 @@ def tab_header
           li { a "Notifications", href: '#notifications', rel: 'tab' }
           li do
             a(href: '#comments', rel: 'tab') do
-              text  "Comments"
+              text "Comments"
               text " (#{number_with_delimiter @bug.comments_count})" if @bug.comments_count > 0
             end
           end
@@ -187,7 +191,7 @@ def blame_tab
           victims = @bug.blamed_users
           p do
             text "According to the VCS blame function, fault seems to lie with "
-            text! victims.map { |v| capture { mail_to v.email, (v.user.try(:name) || v.email) } }.to_sentence
+            text! victims.map { |v| capture { mail_to v.email, (v.user.try!(:name) || v.email) } }.to_sentence
             text ".*"
           end if victims.any?
 
@@ -276,7 +280,11 @@ def management_tab
 
             p "… or …"
 
-            button_to "Delete this bug", project_environment_bug_url(@project, @environment, @bug), :'data-method' => 'delete', class: 'warning'
+            button "Delete this bug",
+                   href:            project_environment_bug_url(@project, @environment, @bug),
+                   'data-sqmethod'  => 'DELETE',
+                   class:           'warning',
+                   'data-sqconfirm' => "Are you sure you want to delete this bug and all its occurrences?"
             p(class: 'help-block') do
               text "This will remove all occurrences, comments, etc. Use for (e.g.) sensitive data or false notifications."
               text " All bugs marked as duplicate of this bug will be deleted as well." if @bug.duplicate?
@@ -330,23 +338,43 @@ def notifications_tab
           end
         end
 
+        if @project.pagerduty_service_key?
+          form_for([@project, @environment, @bug], format: 'json', html: {class: 'labeled whitewashed', id: 'page-threshold-form'}) do |f|
+            fieldset do
+              h5 "Page the team when this bug occurs a lot"
+              p "You will be paged even if the bug is marked as unimportant. This is useful for exceptions you do not intend to fix, but can blow up."
+
+              f.label :page_threshold, "this many exceptions occur"
+              f.number_field :page_threshold, class: 'input-small'
+
+              f.label :page_period, "in this period of time"
+              span(class: 'input-append') do
+                f.number_field :page_period, class: 'input-small input-inline'
+                span " seconds"
+              end
+            end
+
+            div(class: 'form-actions') { f.submit class: 'default' }
+          end
+        end
+
         nt = current_user.notification_thresholds.find_by_bug_id(@bug.id) || NotificationThreshold.new
         form_for(nt, url: project_environment_bug_notification_threshold_url(@project, @environment, @bug, format: 'json'), html: {class: 'labeled whitewashed', id: 'notification-form'}) do |f|
           fieldset do
-            h5 "Notify me when this bug occurs a lot"
+            h5 "Email me when this bug occurs a lot"
 
             f.label :threshold, "this many exceptions occur"
             f.number_field :threshold, class: 'input-small'
 
             f.label :period, "in this period of time"
-            div(class: 'field-group') do
-              f.number_field :period, class: 'input-small'
-              text " seconds"
+            span(class: 'input-append') do
+              f.number_field :period, class: 'input-small input-inline'
+              span " seconds"
             end
 
             div(class: 'form-actions') do
               f.submit class: 'default'
-              button_to 'Remove', project_environment_bug_notification_threshold_url(@project, @environment, @bug), :'data-method' => 'DELETE'
+              button_to 'Remove', project_environment_bug_notification_threshold_url(@project, @environment, @bug), :'data-sqmethod' => 'DELETE'
             end
           end
         end
@@ -410,12 +438,12 @@ def render_diff(diff, id, index, acc)
         deletions = diff.patch.split("\n").select { |l| l.start_with?('-') }.size - 1
         additions = diff.patch.split("\n").select { |l| l.start_with?('+') }.size - 1
 
-        icon = if diff.type == 'new' then 'plus-sign'
-               elsif diff.type == 'deleted' then 'minus-sign'
-               elsif diff.type == 'renamed' then 'share-alt'
+        icon = if diff.type == 'new' then 'plus-circle'
+               elsif diff.type == 'deleted' then 'minus-circle'
+               elsif diff.type == 'renamed' then 'share'
                else 'edit' end
         title = <<-HTML.html_safe
-          <i class="icon-#{icon}"></i>
+          <i class="fa fa-#{icon}"></i>
           <strong>#{diff.path}</strong>
           <code class=short>#{diff.type}</code>
           <span class="additions-deletions">
diff --git a/app/views/bugs/show.js.erb b/app/views/bugs/show.js.erb
index 0da2af9f..761d8479 100644
--- a/app/views/bugs/show.js.erb
+++ b/app/views/bugs/show.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -57,19 +57,23 @@ function PageManager() {
   };
 
   this.setupCommitDropdown = function() {
-    var commits = JSON.parse("<%= escape_javascript @project.repo.log(10).to_json %>");
-    $('#bug_resolution_revision').autocomplete({
-      suggestions: commits,
-      elementBuilder: function(li, commit) {
-        li.append($('<div/>').text(commit.message));
-        $('<tt/>').text(commit.sha.slice(0, 6)).appendTo(li);
-      },
-      filterSuggestions: function(string, suggestions) {
-        return suggestions.filter(function(commit) {
-          return commit.sha.indexOf(string.toLowerCase()) == 0 || commit.message.toLowerCase().indexOf(string.toLowerCase()) == 0;
+    $.ajax("<%= project_commits_url(@project, format: 'json') %>", {
+      type: 'GET',
+      success: function(commits) {
+        $('#bug_resolution_revision').autocomplete({
+            suggestions: commits,
+            elementBuilder: function(li, commit) {
+              li.append($('<div/>').text(commit.message));
+              $('<tt/>').text(commit.sha.slice(0, 6)).appendTo(li);
+            },
+            filterSuggestions: function(string, suggestions) {
+              return suggestions.filter(function(commit) {
+                return commit.sha.indexOf(string.toLowerCase()) == 0 || commit.message.toLowerCase().indexOf(string.toLowerCase()) == 0;
+              });
+            },
+            fieldValue: function(suggestion) { return suggestion.sha; }
         });
-      },
-      fieldValue: function(suggestion) { return suggestion.sha; }
+      }
     });
   };
 
@@ -99,7 +103,7 @@ function PageManager() {
             var form = $('<form/>').attr({ 'accept-charset': 'UTF-8', action: comment.url, method: 'post' }).appendTo(editDiv);
             var extras = $('<div/>').css({ margin: 0, padding: 0, display: 'inline' }).appendTo(form);
             $('<input/>').attr({ name: 'utf8', type: 'hidden', value: '✓' }).appendTo(extras);
-            $('<input/>').attr({ name: '_method', type: 'hidden', value: 'put' }).appendTo(extras);
+            $('<input/>').attr({ name: '_method', type: 'hidden', value: 'patch' }).appendTo(extras);
             $('<input/>').attr({ name: $('meta[name=csrf-param]').attr('content'), type: 'hidden', value: $('meta[name=csrf-token]').attr('content') }).appendTo(extras);
             $('<textarea/>').attr({ name: 'comment[body]', rows: 4 }).val(comment.body).appendTo(form);
             var buttons = $('<p/>').appendTo(form);
@@ -164,8 +168,8 @@ function PageManager() {
       $.ajax("<%= watch_project_environment_bug_url(@project, @environment, @bug, format: 'json') %>", {
         type: 'POST',
         success: function(_, _, xhr) {
-          if (xhr.status == 204) $('#watch').removeClass('icon-star').addClass('icon-star-empty');
-          else if (xhr.status == 201) $('#watch').removeClass('icon-star-empty').addClass('icon-star');
+          if (xhr.status == 204) $('#watch').removeClass('fa fa-star').addClass('fa fa-star-o');
+          else if (xhr.status == 201) $('#watch').removeClass('fa fa-star-o').addClass('fa fa-star');
           else
             new Flash('alert').text("Couldn’t watch or unwatch this bug.");
         },
@@ -192,6 +196,7 @@ function PageManager() {
         complete: function() { deploy_input[0].disabled = false; },
         success: function(bug) {
           deploy_input[0].checked = bug.notify_on_deploy;
+          new Flash('success').text("Your notification settings were updated.");
         },
         error: function() {
           new Flash('alert').text("Error updating email settings.");
@@ -208,6 +213,7 @@ function PageManager() {
         complete: function() { occurrence_input[0].disabled = false; },
         success: function(bug) {
           occurrence_input[0].checked = bug.notify_on_occurrence;
+          new Flash('success').text("Your notification settings were updated.");
         },
         error: function() {
           new Flash('alert').text("Error updating email settings.");
@@ -244,6 +250,10 @@ function PageManager() {
   };
 
   this.setupNotificationForm = function() {
+    new SmartForm($('#page-threshold-form'), function() {
+      new Flash('success').text("Paging options saved.");
+    });
+
     return new SmartForm($('#notification-form'), function() {
       new Flash('success').text("Notification set.");
     });
@@ -268,19 +278,19 @@ function PageManager() {
 
         if (field.val() == '') return;
 
-        $('<i/>').addClass('icon-refresh').appendTo(status);
+        $('<i/>').addClass('fa fa-refresh').appendTo(status);
         $.ajax("<%= jira_issue_url('REPLACEME') %>".replace('REPLACEME', field.val()), {
           type: 'GET',
           success: function(issue) {
             status.empty();
-            $('<i/>').addClass('icon-ok text-success').appendTo(status);
+            $('<i/>').addClass('fa fa-check-circle text-success').appendTo(status);
             var url = "<%= Squash::Configuration.jira.api_host %><%= Squash::Configuration.jira.api_root %>/browse/" + issue.key;
             $('<a/>').attr({href: url, target: '_blank'}).text(issue.fields.summary).appendTo(info);
             if (statusesLoaded) statusSelector.removeAttr('disabled');
           },
           error: function(xhr) {
             status.empty();
-            $('<i/>').addClass('icon-remove text-error').appendTo(status);
+            $('<i/>').addClass('fa fa-times-circle text-error').appendTo(status);
             if (xhr.status == 404)
               $('<span/>').addClass('text-error').text("Couldn’t find that JIRA issue.").appendTo(info);
             else
diff --git a/app/views/layouts/application.html.rb b/app/views/layouts/application.html.rb
index 0aa7be17..1bec6e07 100644
--- a/app/views/layouts/application.html.rb
+++ b/app/views/layouts/application.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -185,7 +185,7 @@ def navbar_large
               navbar_environments('large') if @project
               li(id: 'quicknav-container') { input type: 'search', id: 'quicknav', placeholder: 'Search' }
               li { link_to "My Account", account_url }
-              li { link_to(logout_url) { i class: 'icon-signout'} }
+              li { link_to(logout_url) { i class: 'fa fa-sign-out'} }
             else
               li(id: 'quicknav-container') { text! '&nbsp;' }
               li { link_to "Log In", login_url }
@@ -205,11 +205,11 @@ def navbar_small
             end
             if logged_in?
               li(id: 'quicknav-container') { text! '&nbsp;' }
-              li { link_to(logout_url) { i class: 'icon-signout'} }
-              li { a class: 'icon-chevron-down', rel: 'dropdown', href: '#expanded-nav' } if logged_in?
+              li { link_to(logout_url) { i class: 'fa fa-sign-out'} }
+              li { a class: 'fa fa-chevron-down', rel: 'dropdown', href: '#expanded-nav' } if logged_in?
             else
               li(id: 'quicknav-container') { text! '&nbsp;' }
-              li { link_to(login_url) { i class: 'icon-signin' } }
+              li { link_to(login_url) { i class: 'fa fa-sign-in' } }
             end
           end
         end
@@ -226,7 +226,7 @@ def navbar_projects(suffix)
         li(class: 'with-dropdown') do
           a(rel: 'dropdown', href: "#navbar-projects-#{suffix}") do
             text(@project ? @project.name : "Projects")
-            i class: 'icon-chevron-down'
+            i class: 'fa fa-chevron-down'
           end
 
           ul(id: "navbar-projects-#{suffix}", class: 'subnav') do
@@ -265,7 +265,7 @@ def navbar_environments(suffix)
         li(class: 'with-dropdown') do
           a(rel: 'dropdown', href: "#navbar-envs-#{suffix}") do
             text(@environment ? @environment.name : "Environments")
-            i class: 'icon-chevron-down'
+            i class: 'fa fa-chevron-down'
           end
 
           ul(id: "navbar-envs-#{suffix}", class: 'subnav') do
diff --git a/app/views/notification_mailer/assign.text.erb b/app/views/notification_mailer/assign.text.erb
index 5bb43652..2ef381e7 100644
--- a/app/views/notification_mailer/assign.text.erb
+++ b/app/views/notification_mailer/assign.text.erb
@@ -1,4 +1,4 @@
-<%= @assigner.try(:name) || "Someone" %> has assigned bug #<%= @bug.number %> on <%= @bug.environment.project.name %>
+<%= @assigner.try!(:name) || "Someone" %> has assigned bug #<%= @bug.number %> on <%= @bug.environment.project.name %>
 to you:
 
 <%= project_environment_bug_url @bug.environment.project, @bug.environment, @bug %>
diff --git a/app/views/notification_mailer/blame.text.erb b/app/views/notification_mailer/blame.text.erb
index 393a9bc2..5ccfd3bb 100644
--- a/app/views/notification_mailer/blame.text.erb
+++ b/app/views/notification_mailer/blame.text.erb
@@ -38,5 +38,16 @@ Is this not really a bug?
 You should take one of the above three actions -- don't just let the bug sit
 there!
 
+----
+
+<% if @bug.occurrences.first %>
+
+Stack trace of initial occurrence:
+
+<%= render_backtrace(@bug.occurrences.first.faulted_backtrace).indent(2) %>
+
+----
+<% end %>
+
         Yours truly,
         Squash
diff --git a/app/views/notification_mailer/initial.text.erb b/app/views/notification_mailer/initial.text.erb
index d8ae02fd..5901f3c9 100644
--- a/app/views/notification_mailer/initial.text.erb
+++ b/app/views/notification_mailer/initial.text.erb
@@ -15,5 +15,15 @@ in <%= @bug.file %>:<%= @bug.line %>
 
 <%= @bug.message_template %>
 
+<% if @bug.occurrences.first %>
+----
+
+Stack trace of initial occurrence:
+
+<%= render_backtrace(@bug.occurrences.first.faulted_backtrace).indent(2) %>
+
+----
+<% end %>
+
         Yours truly,
         Squash
diff --git a/app/views/notification_mailer/occurrence.text.erb b/app/views/notification_mailer/occurrence.text.erb
index db432f4b..e2710b49 100644
--- a/app/views/notification_mailer/occurrence.text.erb
+++ b/app/views/notification_mailer/occurrence.text.erb
@@ -12,14 +12,16 @@ in <%= @bug.file %>
 in <%= @bug.file %>:<%= @bug.line %>
 <% end %>
 
-<%= @bug.message_template %>
-
 THE OCCURRENCE
 
 <%= @occurrence.message %>
 
 <% if @occurrence.web? %>
+<% if @occurrence.url %>
 Request: <%=  @occurrence.request_method %> <%= @occurrence.url.to_s %>
+<% else %>
+Request: <%=  @occurrence.request_method %> (invalid URL)
+<% end %>
 <% end %>
 <% if @occurrence.rails? %>
 Controller: <%= @occurrence.controller %>
@@ -42,6 +44,10 @@ Network Type: <%= @occurrence.network_type %>
 Web Browser: <%= @occurrence.browser_name %> (<%= @occurrence.browser_version %>)
 <% end %>
 
+Stack trace:
+
+<%= render_backtrace(@occurrence.faulted_backtrace).indent(2) %>
+
         Yours truly,
         Squash
 ---
diff --git a/app/views/notification_mailer/resolved.text.erb b/app/views/notification_mailer/resolved.text.erb
index 93b1f19b..43db0d15 100644
--- a/app/views/notification_mailer/resolved.text.erb
+++ b/app/views/notification_mailer/resolved.text.erb
@@ -1,4 +1,4 @@
-<%= @resolver.try(:name) || "Someone" %> has <%= @bug.fixed? ? "resolved a bug" : "marked a bug as irrelevant" %>
+<%= @resolver.try!(:name) || "Someone" %> has <%= @bug.fixed? ? "resolved a bug" : "marked a bug as irrelevant" %>
 that you were assigned to:
 
 <%= project_environment_bug_url @bug.environment.project, @bug.environment, @bug %>
diff --git a/app/views/occurrences/index.atom.builder b/app/views/occurrences/index.atom.builder
index d754480c..422effad 100644
--- a/app/views/occurrences/index.atom.builder
+++ b/app/views/occurrences/index.atom.builder
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/views/occurrences/show.html.rb b/app/views/occurrences/show.html.rb
index eb79e3b4..f4f9d58a 100644
--- a/app/views/occurrences/show.html.rb
+++ b/app/views/occurrences/show.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ module Views
   module Occurrences
     # @private
     class Show < Views::Layouts::Application
-      include BacktraceRendering
+      include HTMLBacktraceRendering
 
       needs :project, :environment, :bug, :occurrence
 
@@ -98,7 +98,7 @@ def basic_info
       def other_occurrence_info
         if @occurrence.web?
           h5 "Request"
-          pre "#{@occurrence.request_method} #{@occurrence.url.to_s}", class: 'scrollable'
+          pre "#{@occurrence.request_method} #{@occurrence.url.try!(:to_s) || '(invalid URL)'}", class: 'scrollable'
         end
       end
 
@@ -363,7 +363,7 @@ def parameter_table(values)
               th "Value"
             end
           end
-          if values.empty?
+          if values.blank?
             td "No values", colspan: 3, class: 'no-results'
           else
             values.sort.each do |(name, value)|
diff --git a/app/views/occurrences/show.js.erb b/app/views/occurrences/show.js.erb
index ef728661..77eb1d57 100644
--- a/app/views/occurrences/show.js.erb
+++ b/app/views/occurrences/show.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/app/views/project/membership/edit.html.rb b/app/views/project/membership/edit.html.rb
index 71d0364f..4e68e0b7 100644
--- a/app/views/project/membership/edit.html.rb
+++ b/app/views/project/membership/edit.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ def sidebar
             project_owner
             project_overview
             if current_user.role(@project) != :owner && !current_user.role(@project).nil?
-              p { button_to "Leave Project", project_my_membership_url(@project), 'data-method' => 'DELETE', class: 'warning' }
+              p { button_to "Leave Project", project_my_membership_url(@project), 'data-sqmethod' => 'DELETE', class: 'warning' }
             end
           end
 
@@ -86,7 +86,7 @@ def project_overview
         def email_settings
           form_for(@membership,
                    url:    {controller: 'project/membership', action: 'update', project_id: @project.to_param},
-                   method: :put,
+                   method: :patch,
                    html:   {class: 'labeled'}) do |f|
 
             fieldset do
diff --git a/app/views/project/membership/edit.js.erb b/app/views/project/membership/edit.js.erb
index 42b243f8..1ef0ef4c 100644
--- a/app/views/project/membership/edit.js.erb
+++ b/app/views/project/membership/edit.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/app/views/projects/edit.html.rb b/app/views/projects/edit.html.rb
index e5b52f6a..0b28c64b 100644
--- a/app/views/projects/edit.html.rb
+++ b/app/views/projects/edit.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,8 +22,13 @@ module Projects
     class Edit < Views::Projects::Show
       include Accordion
 
-      def page_title() "Edit #{@project.name}" end
-      def breadcrumbs() [@project, "Configuration"] end
+      def page_title()
+        "Edit #{@project.name}"
+      end
+
+      def breadcrumbs()
+        [@project, "Configuration"]
+      end
 
       private
 
@@ -56,9 +61,9 @@ def api_key
         end
         p do
           button "Regenerate your API key",
-                 href:              rekey_project_url(@project),
-                 :'data-method' =>  'put',
-                 :'data-confirm' => "This will break any existing Squash client integrations. Continue?"
+                 href:             rekey_project_url(@project),
+                 :'data-sqmethod'  => 'patch',
+                 :'data-sqconfirm' => "This will break any existing Squash client integrations. Continue?"
         end if [:owner, :admin].include?(current_user.role(@project))
 
         h3 do
@@ -94,9 +99,12 @@ def ruby_on_rails
         end
         pre <<-RUBY, class: 'brush: ruby; light: true'
 Squash::Ruby.configure :api_host => '#{request.protocol + request.host_with_port}',
-                       :api_key => '#{@project.api_key}'
+                       :api_key => '#{@project.api_key}',
+                       :disabled => (Rails.env.development? || Rails.env.test?)
         RUBY
 
+        p "(This code is specific to Rails 3 but Squash is also compatible with Rails 2.)"
+
         p do
           text "Enable automatic exception notification as part of the request process by extending your "
           code "ApplicationController"
@@ -246,15 +254,10 @@ def javascript_client
         h5 "Source-mapping"
 
         p do
-          text "If your toolchain is capable of generating source maps (Clojure is), you can upload those source maps to Squash to un-minify your backtraces, using the "
-          code "upload_source_map"
-          text " binary (included as part of the gem). An example command that could be added to your deploy script:"
-          pre <<-SH, class: 'brush: shell, light: true'
-/path/to/upload_source_map #{@project.api_key} production artifacts/mapping.json https://your.application/assets/minified.js
-          SH
+          text "You will need to generate source maps for your JavaScript if you want backtraces that correspond to files in your project. See the Squash Javascript client README for information on how to generate and upload source maps to Squash."
         end
       end
-      
+
       def java
         p do
           text "Download the "
@@ -305,6 +308,10 @@ def configuration
               samp "[EMAIL?]"
               text "."
             end
+
+            f.label :blamer_type
+            f.select :blamer_type, Blamer::Base.subclasses.map { |c| [c.human_name, c.to_s] }
+            p "If you would like to avoid making potentially slow requests to the Git repository, at the expense of less intelligent code analysis, choose the Git-free blamer.", class: 'help-block'
           end
 
           fieldset do
@@ -406,10 +413,26 @@ def configuration
             p "If you uncheck this, PagerDuty will not be notified of any new occurrences. Acknowledgements and resolutions of existing incidents will still be sent.", class: 'help-block'
           end unless Squash::Configuration.pagerduty.disabled
 
+          fieldset do
+            h5 "Asset Compilation"
+
+            f.label(:digest_in_asset_names, class: 'checkbox-label') do
+              f.check_box :digest_in_asset_names
+              text "My application generates unique asset names (with a digest) for JavaScript files"
+            end
+
+            p do
+              text "If your application generates digested asset names (such as "
+              kbd "application-abc123.js"
+              text "), check this option. Squash will search more than just the current revision when locating JavaScript source maps. This prevents you from having to generate and upload source maps for every deploy, even ones that don't modify a JavaScript asset."
+            end
+
+            p "Ruby on Rails applications that use Sprockets do generate digested asset names."
+          end
+
           div(class: 'form-actions') { f.submit class: 'default' }
         end
       end
     end
   end
 end
-
diff --git a/app/views/projects/edit.js.erb b/app/views/projects/edit.js.erb
index 4151dc77..28f2dd64 100644
--- a/app/views/projects/edit.js.erb
+++ b/app/views/projects/edit.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/app/views/projects/index.html.rb b/app/views/projects/index.html.rb
index ea507133..89a40b97 100644
--- a/app/views/projects/index.html.rb
+++ b/app/views/projects/index.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/views/projects/index.js.erb b/app/views/projects/index.js.erb
index c787c3af..36d1a061 100644
--- a/app/views/projects/index.js.erb
+++ b/app/views/projects/index.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -94,10 +94,10 @@ function PageManager() {
         { key: 'occurrences', title: "Counts", sortable: false, htmlGenerator: function(bug) {
           var sp = $('<span/>');
           sp.append(bug.occurrences_count);
-          $('<i/>').addClass('icon-exclamation-sign').appendTo(sp);
+          $('<i/>').addClass('fa fa-exclamation-circle').appendTo(sp);
           if (bug.comments_count > 0) {
             sp.append(' ' + bug.comments_count);
-            $('<i/>').addClass('icon-comment').appendTo(sp);
+            $('<i/>').addClass('fa fa-comment').appendTo(sp);
           }
           return sp;
         } },
@@ -106,7 +106,7 @@ function PageManager() {
         } },
         { key: 'user_name', title: "Assigned To", sortable: false, textGenerator: function(bug) { return bug.assigned_user ? bug.assigned_user.name : "no one"; } },
         { key: 'unwatch', title: '', sortable: false, htmlGenerator: function(bug) {
-          return $('<a/>').addClass('icon-star icon-large unwatch').attr('href', '#').click(function() {
+          return $('<a/>').addClass('fa fa-star icon-large unwatch').attr('href', '#').click(function() {
             $.ajax(bug.watch_url, {
               type: 'POST',
               success: function() { table.refreshData(); },
@@ -147,10 +147,10 @@ function PageManager() {
                           { key: 'occurrences', title: "Counts", sortable: false, htmlGenerator: function(bug) {
                             var sp = $('<span/>');
                             sp.append(bug.occurrences_count);
-                            $('<i/>').addClass('icon-exclamation-sign').appendTo(sp);
+                            $('<i/>').addClass('fa fa-exclamation-circle').appendTo(sp);
                             if (bug.comments_count > 0) {
                               sp.append(' ' + bug.comments_count);
-                              $('<i/>').addClass('icon-comment').appendTo(sp);
+                              $('<i/>').addClass('fa fa-comment').appendTo(sp);
                             }
                             return sp;
                           } },
diff --git a/app/views/projects/show.html.rb b/app/views/projects/show.html.rb
index 3d9f471f..fe949bbb 100644
--- a/app/views/projects/show.html.rb
+++ b/app/views/projects/show.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ def project_info
             if current_user.role(@project) == :owner
               delete_project
             elsif !current_user.role(@project).nil?
-              p { button_to "Leave Project", project_my_membership_url(@project), :'data-method' => 'DELETE', class: 'warning' }
+              p { button_to "Leave Project", project_my_membership_url(@project), :'data-sqmethod' => 'DELETE', class: 'warning' }
             end
           end
         end
@@ -85,7 +85,7 @@ def project_overview
         if current_user.role(@project)
           p { link_to "Change membership settings", edit_project_my_membership_url(@project) }
         else
-          p { button_to "Join this team", join_project_my_membership_url(@project), :'data-method' => 'POST' }
+          p { button_to "Join this team", join_project_my_membership_url(@project), :'data-sqmethod' => 'POST' }
         end
       end
 
@@ -95,7 +95,13 @@ def delete_project
           strong "Beware!"
           text " Deleting this project will delete all environments, all bugs, all occurrences, all comments, and all other data."
         end
-        p { button_to "Delete", project_url(@project), :'data-method' => :delete, :'data-confirm' => "Are you SURE you want to delete the project #{@project.name}?", class: 'warning' }
+        p do
+          button_to "Delete",
+                    project_url(@project),
+                    :'data-sqmethod'  => :delete,
+                    :'data-sqconfirm' => "Are you SURE you want to delete the project #{@project.name}?",
+                    class:            'warning'
+        end
       end
 
       def environments_grid
diff --git a/app/views/projects/show.js.erb b/app/views/projects/show.js.erb
index 6fac2cc6..b0015e99 100644
--- a/app/views/projects/show.js.erb
+++ b/app/views/projects/show.js.erb
@@ -1,4 +1,4 @@
-// Copyright 2012 Square Inc.
+// Copyright 2014 Square Inc.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -41,21 +41,21 @@ function PageManager() {
     var self = this;
     $('a.make-default').click(function(e) {
       $.ajax("<%= project_url @project, format: 'json' %>", {
-        type: 'PUT',
+        type: 'PATCH',
         data: $.param({
-                        'project[default_environment_id]': $(e.currentTarget).attr('data-id'),
+                        'project[default_environment_id]': $(e.currentTarget).data('id'),
                         '<%= request_forgery_protection_token %>': '<%= form_authenticity_token %>'
                       }),
         success: function() {
           // change Default to Make Default
           var parent = $('#default-indicator').parent();
-          var id = $('#default-indicator').attr('data-id');
+          var id = $('#default-indicator').data('id');
           parent.empty();
           $('<a/>').text('Make default').attr({href: '#', 'data-id': id}).addClass('make-default').appendTo(parent);
 
           // change Make Default to Default
           parent = $(e.currentTarget).parent();
-          id = $(e.currentTarget).attr('data-id');
+          id = $(e.currentTarget).data('id');
           parent.empty();
           $('<strong/>').text("Default").attr({'data-id': id, id: 'default-indicator'}).appendTo(parent);
 
diff --git a/app/views/sessions/new.html.rb b/app/views/sessions/new.html.rb
index 2e30b0da..22fdd514 100644
--- a/app/views/sessions/new.html.rb
+++ b/app/views/sessions/new.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/app/views/users/show.html.rb b/app/views/users/show.html.rb
index 0c54c398..a9b3c870 100644
--- a/app/views/users/show.html.rb
+++ b/app/views/users/show.html.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 00000000..66e9889e
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 00000000..5191e692
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 00000000..17240489
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/setup.rb b/bin/setup
similarity index 88%
rename from setup.rb
rename to bin/setup
index 0bcce890..81586f3d 100755
--- a/setup.rb
+++ b/bin/setup
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -193,7 +193,7 @@ def choose(question, choices, default=nil)
 
 say "Welcome! Let's set up your Squash installation.".bold
 puts "I'll ask you some questions to help configure Squash for your needs.",
-     "Remember read the README.md file to familiarize yourself with the Squash",
+     "Remember to read the README.md file to familiarize yourself with the Squash",
      "codebase, as there's a strong likelihood you'll need to make other tweaks",
      "to fully support your particular environment."
 puts
@@ -203,7 +203,7 @@ def choose(question, choices, default=nil)
 say
 say "Checking the basic environment..."
 
-if File.absolute_path(Dir.getwd) != File.absolute_path(File.dirname(__FILE__))
+if File.absolute_path(Dir.getwd) != File.absolute_path(File.dirname(__FILE__) + '/..')
   say "You are not running this script from the Rails project's root directory.".red.bold
   say "Please cd into the project root and re-run this script.".magenta
   exit 1
@@ -257,18 +257,42 @@ def choose(question, choices, default=nil)
   puts "If you don't know what URL your production instance will have, just make",
        "something up. You can always change it later."
 
-  hostname     = query("What hostname will your production instance have (e.g., squash.mycompany.com)?")
-  https        = prompt("Will your production instance be using HTTPS?", hostname)
-  email_domain = query("What is the domain portion of your organization's email addresses?", hostname)
-  sender       = query("What sender should Squash emails use?", "squash@#{email_domain}")
-
+  hostname      = query("What hostname will your production instance have (e.g., squash.mycompany.com)?")
+  https         = prompt("Will your production instance be using HTTPS?", hostname)
+  email_domain  = query("What is the domain portion of your organization's email addresses?", hostname)
+  sender        = query("What sender should Squash emails use?", "squash@#{email_domain}")
+  mail_strategy = choose("How will Squash send email?", %w(sendmail smtp))
+
+  if mail_strategy == 'smtp'
+    smtp_domain = email_domain
+    smtp_host   = query("What's the hostname of your SMTP server?")
+    smtp_port   = query("What's the port of your SMTP server?", '25')
+    smtp_auth   = choose("What's the authentication for your SMTP server?", %w(none plain ntlm))
+    unless smtp_auth == 'none'
+      smtp_username = query("What's the username for your SMTP server?")
+      smtp_password = query("What's the password for your SMTP server?")
+    end
+    smtp_ssl    = prompt("Do you want to skip SSL verification?")
+  end
+  smtp_settings = {
+                    'address'               => smtp_host,
+                    'port'                  => smtp_port,
+                    'domain'                => smtp_domain,
+                    'user_name'             => smtp_username,
+                    'password'              => smtp_password,
+                    'authentication'        => smtp_auth,
+                    'enable_starttls_auto'  => smtp_ssl
+                  }
   say "Updating config/environments/common/mailer.yml..."
   File.open('config/environments/common/mailer.yml', 'w') do |f|
     f.puts({
-               'from'   => sender,
-               'domain' => email_domain
+               'from'           => sender,
+               'domain'         => email_domain,
+               'strategy'       => mail_strategy,
+               'smtp_settings'  => smtp_settings
            }.to_yaml)
   end
+
   say "Updating config/environments/production/mailer.yml..."
   File.open('config/environments/production/mailer.yml', 'w') do |f|
     f.puts({
@@ -278,17 +302,6 @@ def choose(question, choices, default=nil)
                }
            }.to_yaml)
   end
-  unless https
-    say "Updating config/environments/production.rb..."
-    prod_config = File.read('config/environments/production.rb')
-    prod_config.sub! 'config.force_ssl = true', 'config.force_ssl = false'
-    prod_config.sub! 'require "rack/ssl"', 'require "rack/cache"'
-    prod_config.sub! 'config.middleware.insert_before ::Rack::SSL, Ping',
-                     'config.middleware.insert_after ::Rack::Cache, Ping'
-    File.open('config/environments/production.rb', 'w') do |f|
-      f.puts prod_config
-    end
-  end
 
   url = query("What URL will production Squash be available at?", "http#{'s' if https}://#{hostname}")
   say "Updating config/environments/production/javascript_dogfood.yml..."
@@ -354,18 +367,18 @@ def choose(question, choices, default=nil)
   say "If you don't know the answer to a question, give a best guess. You can always",
       "change your database.yml file later."
 
-  dev_host = query("What is the hostname of the development PostgreSQL server?", '')
+  dev_host = query("What is the hostname of the development PostgreSQL server?", 'localhost')
   dev_user = query("What PostgreSQL user will Squash use in development?", 'squash')
   dev_pw   = query("What is #{dev_user}@#{dev_host}'s password?", '')
   dev_local = dev_host.nil? || dev_host == 'localhost' || dev_host == '0.0.0.0' || dev_host == '127.0.0.1'
   dev_db   = query("What is the name of your PostgreSQL development database?#{" (It doesn't have to exist yet.)" if dev_local}", 'squash_development')
 
-  test_host = query("What is the hostname of the test PostgreSQL server?", '')
+  test_host = query("What is the hostname of the test PostgreSQL server?", 'localhost')
   test_user = query("What PostgreSQL user will Squash use in test?", dev_user)
   test_pw   = query("What is #{test_user}@#{test_host}'s password?", '')
   test_db   = query("What is the name of your PostgreSQL test database?", 'squash_test')
 
-  prod_host = query("What is the hostname of the production PostgreSQL server?", '')
+  prod_host = query("What is the hostname of the production PostgreSQL server?", 'localhost')
   prod_user = query("What PostgreSQL user will Squash use in production?", dev_user)
   prod_pw   = query("What is #{prod_user}@#{prod_host}'s password?", '')
   prod_db   = query("What is the name of your PostgreSQL production database?", 'squash_production')
@@ -403,6 +416,8 @@ def choose(question, choices, default=nil)
 end
 
 if step < 4
+  run 'bundle', 'install'
+
   db_config = YAML.load_file('config/database.yml')
 
   dev_host  = db_config['development']['host']
@@ -460,7 +475,5 @@ def choose(question, choices, default=nil)
 say "  and copy the generated API key to this file.".yellow
 puts
 say "* Test that all specs pass by running".yellow, 'rspec spec.'.bold.yellow
-puts
-puts "* You can delete this setup script now if you wish.".yellow
 
 FileUtils.rm '/tmp/squash_install_progress'
diff --git a/config.ru b/config.ru
index 8ad5d26d..3f0ba90a 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/application.rb b/config/application.rb
index c7346857..1e31a62e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,18 +14,14 @@
 
 require File.expand_path('../boot', __FILE__)
 
-# Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie"
+require 'rails/all'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(assets: %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+# Load preinitializers
+Dir.glob(File.expand_path('../preinitializers/**/*.rb', __FILE__)).each { |f| require f }
 
 module Squash
   class Application < Rails::Application
@@ -41,10 +37,6 @@ class Application < Rails::Application
     config.autoload_paths << config.root.join('lib')
     config.autoload_paths << config.root.join('lib', 'workers')
 
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
     # Activate observers that should always be running.
     config.active_record.observers = :bug_observer, :comment_observer,
         :event_observer, :watch_observer, :occurrence_observer, :deploy_observer
@@ -53,42 +45,39 @@ class Application < Rails::Application
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     config.time_zone = 'Pacific Time (US & Canada)'
 
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = 'utf-8'
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters << :password
-
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
 
-    # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-    config.assets.precompile << 'flot/excanvas.js'
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Use custom generators
     config.generators do |g|
       g.template_engine     :erector
       g.test_framework      :rspec, fixture: true, views: false
       g.integration_tool    :rspec
       g.fixture_replacement :factory_girl, dir: 'spec/factories'
     end
+
+    # Configure allowed origins
+    config.middleware.use Rack::Cors do
+      allow do
+        origins *Squash::Configuration.dogfood.allowed_origins
+        resource '/api/1.0/notify', headers: :any, methods: [:post]
+      end
+    end
+
+    require config.root.join('app', 'middleware', 'ping')
+    if config.force_ssl
+      config.middleware.insert_before ActionDispatch::SSL, Ping
+    else
+      config.middleware.insert_before Rack::Runtime, Ping
+    end
   end
 end
 
 require 'api/errors'
+
+Sprockets.register_engine '.coffee', Squash::Javascript::SourceMappingCoffeescriptTemplate
diff --git a/config/boot.rb b/config/boot.rb
index 53b5e596..3d7fbafc 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/database.yml b/config/database.yml
index 4878e04c..15ca01c0 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,7 +1,7 @@
 development:
   adapter: postgresql
   encoding: utf8
-  hostname:
+  host: localhost
   username: squash
   password:
   database: squash_development
@@ -9,7 +9,7 @@ development:
 test:
   adapter: postgresql
   encoding: utf8
-  hostname:
+  host: localhost
   username: squash
   password:
   database: squash_test
@@ -17,7 +17,7 @@ test:
 production:
   adapter: postgresql
   encoding: utf8
-  hostname:
+  host: localhost
   username: squash
   password:
   database: squash_production
diff --git a/config/environment.rb b/config/environment.rb
index a5d0ee4a..082a646b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,10 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-Dir.glob(File.expand_path('../preinitializers/**/*.rb', __FILE__)).each { |f| require f }
-
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-Squash::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!
diff --git a/config/environments/common/activerecord.yml b/config/environments/common/activerecord.yml
new file mode 100644
index 00000000..6e64b5a4
--- /dev/null
+++ b/config/environments/common/activerecord.yml
@@ -0,0 +1,2 @@
+---
+cursors: false
diff --git a/config/environments/common/concurrency.yml b/config/environments/common/concurrency.yml
index 015dc585..91c54022 100644
--- a/config/environments/common/concurrency.yml
+++ b/config/environments/common/concurrency.yml
@@ -1,5 +1,6 @@
 ---
 background_runner: Multithread
+
 multithread:
   priority_threshold: 50
   pool_size: 20
@@ -8,7 +9,8 @@ multithread:
     CommentNotificationMailer: 80
     DeployFixMarker: 70
     DeployNotificationMailer: 80
-    JiraStatusUpdater: 20
+    JiraStatusWorker: 20
+    ObfuscationMapCreator: 60
     ObfuscationMapWorker: 60
     OccurrenceNotificationMailer: 80
     OccurrencesWorker: 40
@@ -16,5 +18,79 @@ multithread:
     PagerDutyNotifier: 80
     PagerDutyResolver: 20
     ProjectRepoFetcher: 30
+    SourceMapCreator: 60
     SourceMapWorker: 60
+    SymbolicationCreator: 60
     SymbolicationWorker: 60
+
+resque:
+  development: "localhost:6379"
+  production: "localhost:6379"
+  test: "localhost:6379"
+  pool:
+    squash: 2
+  queue:
+    CommentNotificationMailer: squash
+    DeployFixMarker: squash
+    DeployNotificationMailer: squash
+    JiraStatusWorker: squash
+    ObfuscationMapCreator: squash
+    ObfuscationMapWorker: squash
+    OccurrenceNotificationMailer: squash
+    OccurrencesWorker: squash
+    PagerDutyAcknowledger: squash
+    PagerDutyNotifier: squash
+    PagerDutyResolver: squash
+    ProjectRepoFetcher: squash
+    SourceMapCreator: squash
+    SourceMapWorker: squash
+    SymbolicationCreator: squash
+    SymbolicationWorker: squash
+
+sidekiq:
+  redis:
+    url: "redis://localhost:6379"
+    namespace: squash
+    pidfile: ./tmp/pids/sidekiq.pid
+    concurrency: 12
+    queues:
+    - [emails, 3]
+    - [git, 2]
+    - [occurrences, 1]
+    - [processing, 3]
+    - [services, 2]
+  worker_options:
+    CommentNotificationMailer:
+      queue: emails
+    DeployFixMarker:
+      queue: processing
+    DeployNotificationMailer:
+      queue: emails
+    JiraStatusWorker:
+      queue: services
+      retry: false
+    ObfuscationMapCreator:
+      queue: processing
+    ObfuscationMapWorker:
+      queue: processing
+    OccurrenceNotificationMailer:
+      queue: emails
+    OccurrencesWorker:
+      queue: occurrences
+      retry: false
+    PagerDutyAcknowledger:
+      queue: services
+    PagerDutyNotifier:
+      queue: services
+    PagerDutyResolver:
+      queue: services
+    ProjectRepoFetcher:
+      queue: git
+    SourceMapCreator:
+      queue: processing
+    SourceMapWorker:
+      queue: processing
+    SymbolicationCreator:
+      queue: processing
+    SymbolicationWorker:
+      queue: processing
diff --git a/config/environments/common/dogfood.yml b/config/environments/common/dogfood.yml
index 93ab7e8e..44b304d0 100644
--- a/config/environments/common/dogfood.yml
+++ b/config/environments/common/dogfood.yml
@@ -10,3 +10,4 @@ ignored_exception_messages:
   - This connection has been closed.
 failsafe_log: log/squash.failsafe.log
 disabled: true
+allowed_origins: []
\ No newline at end of file
diff --git a/config/environments/common/mailer.yml b/config/environments/common/mailer.yml
index 4b245141..ebc4cdac 100644
--- a/config/environments/common/mailer.yml
+++ b/config/environments/common/mailer.yml
@@ -1,3 +1,12 @@
 ---
 from: squash@YOUR_DOMAIN
 domain: YOUR_DOMAIN
+strategy: sendmail
+smtp_settings:
+  address:
+  port:
+  domain:
+  user_name:
+  password:
+  authentication:
+  enable_starttls_auto:
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bf18daae..7b29b674 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,45 +12,49 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-Squash::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.cache_classes                       = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load                          = false
 
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local         = true
+  config.action_controller.perform_caching   = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
-  config.active_support.deprecation = :log
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation          = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error       = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug                        = true
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  #config.active_record.auto_explain_threshold_in_seconds = 0.5
-  # (but not with JDBC, of course)
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest                       = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors         = true
 
-  # Expands the lines which load the assets
-  config.assets.debug = true
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
   # Configure development JavaScript self-reporting
+  config.middleware.delete 'Rack::Cors'
   config.middleware.use Rack::Cors do
     allow do
       origins "localhost:#{$own_port}",
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 52f6a8f3..a4bb39c1 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,69 +12,82 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-Squash::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
-  config.cache_classes = true
+  # Code is not reloaded between requests.
+  config.cache_classes                             = true
 
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load                                = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = true
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local               = false
+  config.action_controller.perform_caching         = true
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files                        = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Generate digests for assets URLs
-  config.assets.digest = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor              = Squash::Javascript::SourceMappingJavascriptMinifier
+  # config.assets.css_compressor = :sass
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile                            = false
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest                             = true
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
-  require "rack/ssl"
-  config.middleware.insert_before ::Rack::SSL, Ping
+  # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level                                 = :debug
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks                            = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation                = :notify
 
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter                             = ::Logger::Formatter.new
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4dd6fcb4..89b98daf 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,40 +12,45 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-Squash::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes                              = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load                                 = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files                         = true
+  config.static_cache_control                       = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local                = true
+  config.action_controller.perform_caching          = false
 
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions            = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  config.action_mailer.delivery_method              = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Randomize the order test cases are executed.
+  config.active_support.test_order                  = :random
 
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation                 = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/environments/test/dogfood.yml b/config/environments/test/dogfood.yml
new file mode 100644
index 00000000..10dc5675
--- /dev/null
+++ b/config/environments/test/dogfood.yml
@@ -0,0 +1,2 @@
+---
+exception_behavior_when_disabled: raise
diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb
index dfd9e370..28436a5a 100644
--- a/config/initializers/active_record.rb
+++ b/config/initializers/active_record.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -68,4 +68,19 @@ class ActiveRecord::Relation
 
   # Returns the first record if count is 1, nil otherwise.
   def only() count == 1 ? first : nil end
+
+  # In the event that we're not using cursors, define #cursor to proxy to
+  # #find_each.
+  def cursor
+    CursorProxy.new(self)
+  end
+
+  # @private
+  class CursorProxy
+    delegate :each, to: :relation
+    attr_reader :relation
+    def initialize(relation)
+      @relation = relation
+    end
+  end
 end
diff --git a/config/initializers/active_record_observer_hooks.rb b/config/initializers/active_record_observer_hooks.rb
index 67e9fb66..c829beba 100644
--- a/config/initializers/active_record_observer_hooks.rb
+++ b/config/initializers/active_record_observer_hooks.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 00000000..d4b4b8a7
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+Rails.application.config.assets.precompile << 'flot/excanvas.js'
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 86bfb893..06e8e9e3 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/initializers/concurrency.rb b/config/initializers/concurrency.rb
index 67c4b524..f6cc7982 100644
--- a/config/initializers/concurrency.rb
+++ b/config/initializers/concurrency.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -35,3 +35,7 @@
   Multithread.start
   at_exit { Multithread.stop }
 end
+
+# Load concurrency setup
+
+BackgroundRunner.runner.setup if BackgroundRunner.runner.respond_to?(:setup)
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 00000000..ac5f8b66
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
diff --git a/config/initializers/dogfood.rb b/config/initializers/dogfood.rb
index 80ef89cf..78ec69be 100644
--- a/config/initializers/dogfood.rb
+++ b/config/initializers/dogfood.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 # Auto-configure development dogfood
 
-unless defined?(IRB)
+if defined?(Rails::Server)
   run_server = begin
     Rails.env.development? && (project = Project.find_from_slug('squash'))
   rescue ActiveRecord::StatementInvalid
@@ -32,7 +32,7 @@
     # the course of processing a request without having to be concurrent.
 
     #TODO this is a pretty hacky way of discovering the port
-    $own_port = ARGV.join(' ').scan(/(?:-p|--port)(?:=|\s+)(\d+)/).first.try(:first).try(:to_i) || 3000
+    $own_port = ARGV.join(' ').scan(/(?:-p|--port)(?:=|\s+)(\d+)/).first.try!(:first).try!(:to_i) || 3000
     $self_notify_port = $own_port + 1
 
     Thread.new do
@@ -43,7 +43,7 @@
           while (line = from.gets).present?
             request << line.chomp
           end
-          length = request.detect { |l| l.start_with?('Content-Length: ') }.try(:gsub, /[^0-9]/, '').try(:to_i)
+          length = request.detect { |l| l.start_with?('Content-Length: ') }.try!(:gsub, /[^0-9]/, '').try!(:to_i)
           if length && length > 0
             request << ''
             request << from.read(length)
@@ -58,13 +58,19 @@
             from.puts "Access-Control-Allow-Headers: origin, content-type, x-category"
           else
             from.puts "HTTP/1.1 200 OK"
+            from.puts "Date: #{Time.now.to_s}"
+            from.puts "Access-Control-Allow-Origin: http://localhost:#{$own_port}"
+            from.puts "Access-Control-Allow-Methods: POST, GET, OPTIONS"
+            from.puts "Access-Control-Allow-Headers: origin, content-type, x-category"
           end
           from.puts
           from.close
 
-          to = TCPSocket.new('localhost', $own_port)
-          request.each { |line| to.puts line }
-          to.close
+          unless request.first.starts_with?('OPTIONS')
+            to = TCPSocket.new('localhost', $own_port)
+            request.each { |line| to.puts line }
+            to.close
+          end
         end
       end
     end
diff --git a/config/initializers/field_error_proc.rb b/config/initializers/field_error_proc.rb
index 9169e714..347b078c 100644
--- a/config/initializers/field_error_proc.rb
+++ b/config/initializers/field_error_proc.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 00000000..a1a313b8
--- /dev/null
+++ b/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,18 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/find_in_batches.rb b/config/initializers/find_in_batches.rb
index d86f2e2e..835ca88e 100644
--- a/config/initializers/find_in_batches.rb
+++ b/config/initializers/find_in_batches.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ def find_in_batches(options = {})
 
     pkey                     = Array.wrap(primary_key)
     id_constraints, key_vals = build_id_constraints(pkey.dup, start.dup)
-    records                  = relation.where(id_constraints, *key_vals).all
+    records                  = relation.where(id_constraints, *key_vals).to_a
 
     while records.any?
       records_size = records.size
@@ -57,7 +57,7 @@ def find_in_batches(options = {})
 
       pkey.each_with_index { |key, index| start[index] = records.last.send(key) } if records.any?
       id_constraints, key_vals = build_id_constraints(pkey.dup, start.dup)
-      records                  = relation.where(id_constraints, *key_vals).all
+      records                  = relation.where(id_constraints, *key_vals).to_a
     end
   end
 
diff --git a/config/initializers/fix_email_escaping.rb b/config/initializers/fix_email_escaping.rb
deleted file mode 100644
index 01643b44..00000000
--- a/config/initializers/fix_email_escaping.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2012 Square Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-# https://github.com/rails/rails/issues/687
-# HTML-unsafe characters are escaped in plaintext email templates
-
-module ActionView
-  class Template
-    module Handlers
-      class ERB
-        def call(template)
-          if template.source.encoding_aware?
-            # First, convert to BINARY, so in case the encoding is
-            # wrong, we can still find an encoding tag
-            # (<%# encoding %>) inside the String using a regular
-            # expression
-            template_source = template.source.dup.force_encoding("BINARY")
-
-            erb      = template_source.gsub(ENCODING_TAG, '')
-            encoding = $2
-
-            erb.force_encoding valid_encoding(template.source.dup, encoding)
-
-            # Always make sure we return a String in the default_internal
-            erb.encode!
-          else
-            erb = template.source.dup
-          end
-
-          self.class.erb_implementation.new(
-              erb,
-              ### PATCH
-              :escape => template.identifier !~ /\.html/,
-              ### END PATCH
-              :trim   => (self.class.erb_trim_mode == "-")
-          ).src
-        end
-      end
-    end
-  end
-end
diff --git a/config/initializers/html5.rb b/config/initializers/html5.rb
index 4b2ed309..c3d6950f 100644
--- a/config/initializers/html5.rb
+++ b/config/initializers/html5.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index ae097844..5eb38121 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/initializers/jdbc_fixes.rb b/config/initializers/jdbc_fixes.rb
index 16a201e9..0d9caaa9 100644
--- a/config/initializers/jdbc_fixes.rb
+++ b/config/initializers/jdbc_fixes.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ def sql_for_insert(sql, pk, id_value, sequence_name, binds)
     unless pk
       # Extract the table from the insert sql. Yuck.
       table_ref = extract_table_ref_from_insert_sql(sql)
-      pk = primary_key(table_ref) if table_ref
+      pk        = primary_key(table_ref) if table_ref
     end
 
     # CPK
@@ -36,19 +36,31 @@ def sql_for_insert(sql, pk, id_value, sequence_name, binds)
   # so. No idea why, but this fixes it. This also fixes broken connections after
   # a failover.
 
-  [:execute, :begin_db_transaction, :commit_db_transaction,
-   :rollback_db_transaction, :jdbc_columns, :tables, :indexes,
-   :write_large_object, :primary_keys].each do |meth|
+  [:columns, :begin_db_transaction, :commit_db_transaction,
+   :rollback_db_transaction, :begin_isolated_db_transaction, :create_savepoint,
+   :rollback_to_savepoint, :release_savepoint, :exec_query, :exec_insert,
+   :exec_delete, :exec_update, :exec_query_raw, :_execute, :tables, :indexes,
+   :primary_keys, :write_large_object, :update_lob_value].each do |meth|
     define_method :"#{meth}_with_retry" do |*args, &block|
       begin
         send :"#{meth}_without_retry", *args, &block
       rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError => err
         if err.to_s =~ /This connection has been closed/ # If the connection was somehow pulled out from underneath us...
           reconnect! # reconnect...
-          retry # and try again
+          if @_retried_connection
+            raise
+          else
+            @_retried_connection = true
+            retry # ... and try again
+          end
         elsif err.to_s =~ /Connection reset/ # if, because of that, we bork up any other threads using the same connection...
           # try again; the connection should be fine now
-          retry
+          if @_retried_connection
+            raise
+          else
+            @_retried_connection = true
+            retry
+          end
         else
           raise
         end
diff --git a/config/initializers/jira.rb b/config/initializers/jira.rb
index 5ada7f98..4e35d768 100644
--- a/config/initializers/jira.rb
+++ b/config/initializers/jira.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -30,4 +30,4 @@ def http_conn_with_timeout(*args)
     end
     alias_method_chain :http_conn, :timeout
   end
-end
+end unless Squash::Configuration.jira.disabled?
diff --git a/config/initializers/load_autoload_paths.rb b/config/initializers/load_autoload_paths.rb
index 11b5b347..b08f7c5b 100644
--- a/config/initializers/load_autoload_paths.rb
+++ b/config/initializers/load_autoload_paths.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/initializers/mail.rb b/config/initializers/mail.rb
new file mode 100644
index 00000000..21def752
--- /dev/null
+++ b/config/initializers/mail.rb
@@ -0,0 +1,19 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Configure ActionMailer
+
+if Squash::Configuration.mailer.strategy == 'smtp'
+  ActionMailer::Base.smtp_settings = Squash::Configuration.mailer.smtp_settings.symbolize_keys
+end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 33782c8d..796fae20 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,4 +16,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 10a4401e..fc3e11c7 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,8 +14,13 @@
 
 # Be sure to restart your server when you modify this file.
 
-# Your secret key for verifying the integrity of signed cookies.
+# Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
+
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Squash::Application.config.secret_token = '_SECRET_'
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+Squash::Application.config.secret_key_base = '_SECRET_'
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 77a78aac..72d181d1 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,9 +14,4 @@
 
 # Be sure to restart your server when you modify this file.
 
-Squash::Application.config.session_store :cookie_store, :key => '_squash_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# Squash::Application.config.session_store :active_record_store
+Rails.application.config.session_store :cookie_store, key: '_squash_session'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 65d23c4e..c4028c3b 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 # Be sure to restart your server when you modify this file.
-#
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
@@ -22,7 +22,7 @@
   wrap_parameters format: []
 end
 
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index aee93e6c..dcd6a6a6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -55,7 +55,6 @@ en:
           attributes:
             password:
               exclusion: is too common
-              confirmation: didn’t match
         watch:
           attributes:
             bug_id:
@@ -78,6 +77,8 @@ en:
         line: relevant line
         message_template: exception message
         number: number
+        page_period: PagerDuty occurrence time period
+        page_threshold: PagerDuty occurrence threshold
         resolution_revision: fix commit
         revision: revision of first occurrence
       comment:
@@ -191,6 +192,10 @@ en:
         password_confirmation: confirm password
         username: username
 
+  blamer:
+    recency: Recency-based blamer
+    simple: Git-free blamer
+
   date:
     formats:
       short: "%b %d, %Y"
@@ -199,7 +204,7 @@ en:
     messages:
       accepted: must be accepted
       blank: can’t be blank
-      confirmation: doesn’t match confirmation
+      confirmation: doesn’t match
       empty: can’t be empty
       equal_to: must be equal to %{count}
       even: must be even
@@ -294,6 +299,12 @@ en:
             First occurred in revision %{revision}. More information: %{url}
           not_applicable: N/A
           summary: "%{class_name} on %{file_name}:%{line}"
+    commits:
+      context:
+        commit_not_found: Couldn’t find that commit or file.
+        line_out_of_bounds: Line number is out of range.
+        missing_param: Missing required parameter.
+        repo_nil: Couldn’t load project repository.
     project:
       membership:
         destroy:
@@ -302,11 +313,6 @@ en:
     projects:
       destroy:
         deleted: Project %{name} was deleted.
-      context:
-        commit_not_found: Couldn’t find that commit or file.
-        line_out_of_bounds: Line number is out of range.
-        missing_param: Missing required parameter.
-        repo_nil: Couldn’t load project repository.
       rekey:
         success: The API key for %{name} is now %{api_key}.
     sessions:
diff --git a/config/preinitializers/jruby.rb b/config/preinitializers/jruby.rb
index 9d640a9b..665303b4 100644
--- a/config/preinitializers/jruby.rb
+++ b/config/preinitializers/jruby.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/config/preinitializers/safe_yaml.rb b/config/preinitializers/safe_yaml.rb
new file mode 100644
index 00000000..e39363c1
--- /dev/null
+++ b/config/preinitializers/safe_yaml.rb
@@ -0,0 +1,21 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Let's make SafeYAML act exactly like YAML by default, to avoid surprising
+# behavior.
+SafeYAML::OPTIONS[:default_mode]        = :unsafe
+SafeYAML::OPTIONS[:deserialize_symbols] = true
+
+# And let's whitelist the things we transmit over YAML
+SafeYAML.whitelist! Squash::Java::Namespace
diff --git a/config/preinitializers/source_maps.rb b/config/preinitializers/source_maps.rb
new file mode 100644
index 00000000..87158dd3
--- /dev/null
+++ b/config/preinitializers/source_maps.rb
@@ -0,0 +1,43 @@
+# Ugh. The sourcemap gem defines a module called SourceMap, which shares the name
+# of one of our models. So we have to rename it before we load our model.
+if ::SourceMap.kind_of?(Module)
+  ::GemSourceMap = ::SourceMap
+  Object.send :remove_const, :SourceMap
+elsif ::SourceMap.kind_of?(Class)
+  raise "SourceMap (the model) defined prior to SourceMap (the module) -- see application.rb"
+else
+  raise "SourceMap must be defined -- see application.rb"
+end
+
+# and redefine the methods that use the other SourceMap class
+
+# @private
+class Sprockets::Asset
+  def sourcemap
+    relative_path = if pathname.to_s.include?(Rails.root.to_s)
+                      pathname.relative_path_from(Rails.root)
+                    else
+                      pathname
+                    end.to_s
+    # any extensions after the ".js" can be removed, because they will have
+    # already been processed
+    relative_path.gsub! /(?<=\.js)\..*$/, ''
+    resource_path = [Rails.application.config.assets.prefix, logical_path].join('/')
+
+    mappings = Array.new
+    to_s.lines.each_with_index do |_, index|
+      offset = GemSourceMap::Offset.new(index, 0)
+      mappings << GemSourceMap::Mapping.new(relative_path, offset, offset)
+    end
+    GemSourceMap::Map.new(mappings, resource_path)
+  end
+end
+
+# @private
+class Sprockets::BundledAsset < Sprockets::Asset
+  def sourcemap
+    to_a.inject(GemSourceMap::Map.new) do |map, asset|
+      map + asset.sourcemap
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 1ef5e210..c6d869ed 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 Squash::Application.routes.draw do
   resources :projects, except: [:new] do
-    member do
-      get :context
-      put :rekey
+    member { patch :rekey }
+    resources :commits do
+      member { get :context }
     end
     resources :environments, only: [:update] do
       resources :bugs, except: [:new, :create, :edit] do
@@ -74,4 +74,11 @@
   get 'search' => 'search#search'
 
   root to: 'projects#index'
+
+  if Squash::Configuration.concurrency.background_runner == 'Sidekiq'
+    require 'sidekiq/web'
+    constraints lambda { |request| SidekiqAuthConstraint.authorized?(request) } do
+      mount Sidekiq::Web => '/sidekiq'
+    end
+  end
 end
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 00000000..c9709eed
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: fd1028c1545b8d18bbc63f01c09d98d825002a4c92f275542dc10061b32b5730ca5d1b56a84e9441c23ee5e610365fd923e0a1c594f31915aefadacce67da213
+
+test:
+  secret_key_base: 4274eb8fc145b1b8c2b1a461b5a00cd21d96197d8cbefcecf8fd8cada868fdc3e76c8ba814b76ec943280229406b623092a889226671c850b56778b0ff569c9e
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/db/migrate/1_initial_schema.rb b/db/migrate/1_initial_schema.rb
index b9e9e7f3..86a0b143 100644
--- a/db/migrate/1_initial_schema.rb
+++ b/db/migrate/1_initial_schema.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/db/migrate/20130125021927_index_occurrences_by_bug_and_redirected.rb b/db/migrate/20130125021927_index_occurrences_by_bug_and_redirected.rb
index b51868de..dc51787d 100644
--- a/db/migrate/20130125021927_index_occurrences_by_bug_and_redirected.rb
+++ b/db/migrate/20130125021927_index_occurrences_by_bug_and_redirected.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/db/migrate/20130131002457_track_crashes.rb b/db/migrate/20130131002457_track_crashes.rb
index 86d2459b..745b7398 100644
--- a/db/migrate/20130131002457_track_crashes.rb
+++ b/db/migrate/20130131002457_track_crashes.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/db/migrate/20130131002503_track_bugs_per_device.rb b/db/migrate/20130131002503_track_bugs_per_device.rb
index f7f9151b..66cbd0cb 100644
--- a/db/migrate/20130131002503_track_bugs_per_device.rb
+++ b/db/migrate/20130131002503_track_bugs_per_device.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/db/migrate/20130215185809_fix_condition_on_rule_occurrences_set_latest.rb b/db/migrate/20130215185809_fix_condition_on_rule_occurrences_set_latest.rb
index 6573c545..dbe23bd9 100644
--- a/db/migrate/20130215185809_fix_condition_on_rule_occurrences_set_latest.rb
+++ b/db/migrate/20130215185809_fix_condition_on_rule_occurrences_set_latest.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/db/migrate/20130221020818_create_blames.rb b/db/migrate/20130221020818_create_blames.rb
index 3216365d..bf1297ed 100644
--- a/db/migrate/20130221020818_create_blames.rb
+++ b/db/migrate/20130221020818_create_blames.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/db/migrate/20130222055524_fix_blame_lru_key.rb b/db/migrate/20130222055524_fix_blame_lru_key.rb
index fa5cb0ce..0318a46a 100644
--- a/db/migrate/20130222055524_fix_blame_lru_key.rb
+++ b/db/migrate/20130222055524_fix_blame_lru_key.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/db/migrate/20140130012355_add_mapping_to_source_map.rb b/db/migrate/20140130012355_add_mapping_to_source_map.rb
new file mode 100644
index 00000000..58e9a04f
--- /dev/null
+++ b/db/migrate/20140130012355_add_mapping_to_source_map.rb
@@ -0,0 +1,18 @@
+class AddMappingToSourceMap < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      ALTER TABLE source_maps
+        ADD COLUMN "from" CHARACTER VARYING(24) NOT NULL DEFAULT 'minified' CHECK (CHAR_LENGTH("from") > 0),
+        ADD COLUMN "to" CHARACTER VARYING(24) NOT NULL DEFAULT 'original' CHECK (CHAR_LENGTH("to") > 0)
+    SQL
+
+    execute 'ALTER TABLE source_maps ALTER "from" DROP NOT NULL'
+    execute 'ALTER TABLE source_maps ALTER "to" DROP NOT NULL'
+    execute "DROP INDEX source_maps_env_revision"
+    execute 'CREATE INDEX source_maps_env_revision ON source_maps(environment_id, revision, "from")'
+  end
+
+  def down
+    execute 'ALTER TABLE source_maps DROP "from", DROP "to"'
+  end
+end
diff --git a/db/migrate/20151126022941_add_hosted_filename_to_source_maps.rb b/db/migrate/20151126022941_add_hosted_filename_to_source_maps.rb
new file mode 100644
index 00000000..28acfc2c
--- /dev/null
+++ b/db/migrate/20151126022941_add_hosted_filename_to_source_maps.rb
@@ -0,0 +1,19 @@
+class AddHostedFilenameToSourceMaps < ActiveRecord::Migration
+  def up
+    add_column :source_maps, :filename, :string, limit: 255
+
+    say "Updating existing source maps"
+    SourceMap.reset_column_information
+    SourceMap.find_each(batch_size: 50) do |map|
+      map.update_attribute :filename, map.map.filename
+    end
+
+    change_column :source_maps, :filename, :string, null: false, limit: 255
+
+    add_index :source_maps, :filename
+  end
+
+  def down
+    remove_column :source_maps, :filename
+  end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 2bce6f3a..4c5de5d8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/doc/MAKING_A_CLIENT_LIBRARY.md b/doc/MAKING_A_CLIENT_LIBRARY.md
index ffe80758..73857122 100644
--- a/doc/MAKING_A_CLIENT_LIBRARY.md
+++ b/doc/MAKING_A_CLIENT_LIBRARY.md
@@ -8,7 +8,7 @@ library, and a Squash Rails client library that adds additional HTTP
 information to exception notifications.)
 
 A list of existing client libraries is kept up-to-date in the
-{file:doc/README_FOR_APP.md readme file}.
+{file:README.md readme file}.
 
 If your language or framework isn't in this list, you'll have to write your own
 client. Don't worry; it's easy.
@@ -114,9 +114,30 @@ For more specific information on those last two fields, see the
 
 **Request:** `POST /api/1.0/sourcemap`
 
-This API endpoint is still a work in progress. It will be used for sending
-source maps (e.g., CoffeeScript-to-JavaScript or JavaScript-to-minified) to
-Squash.
+**Body:** JSON-formatted hash with the following **required** fields:
+
+|               |                                                                                                                                                                                                                       |
+|:--------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `environment` | The environment name that this source map applies to.                                                                                                                                                                 |
+| `revision`    | The SHA of the repository revision that this source map was generated from.                                                                                                                                           |
+| `sourcemap`   | Source map data; JSON-serialized, gzipped, and base-64-encoded. (Note that the JSON serialization is different from the V3 source map standard; use the Squash JavaScript client library to generate the source map.) |
+| `from`        | The type of generated code this source map transforms from (`hosted` is used for the final hosted code).                                                                                                              |
+| `to`          | The type of generated or original code this source map transforms to.                                                                                                                                                 |
+
+This API is used to post source maps to Squash. Your deploy toolchain will need
+to generate source maps for every transformation your JavaScript client
+undergoes (CoffeeScript to compiled, compiled to concatenated, concatenated to
+minified, etc.). The JavaScript client library always reports exception
+backtraces with a type of "hosted", so the final source map in your chain should
+convert to the "hosted" format.
+
+For more specific information on these fields, see the
+[Squash JavaScript gem](https://github.com/SquareSquash/javascript).
+
+**Responses:**
+
+* `201 Created`: Symbolication received and recorded.
+* `422 Unprocessable Entity`: Invalid request body.
 
 Backtrace Format
 ----------------
diff --git a/doc/README_FOR_APP.md b/doc/README_FOR_APP.md
deleted file mode 100644
index 9d7f1f6b..00000000
--- a/doc/README_FOR_APP.md
+++ /dev/null
@@ -1,467 +0,0 @@
-Squash: A squarish bug spray
-============================
-
-**An open-source project from [Square](http://github.com/square)**
-
-Squash is a collection of tools that help engineers find and kill bugs in their
-code by automatically collecting, collating and analyzing run time exceptions.
-Squash consists of the following components:
-
-* **Client libraries:** Client libraries for different systems (Ruby, Ruby on
-  Rails, Cocoa with Objective-C, etc.) catch and record errors when they occur,
-  then send them to the API endpoint. Client libraries can be found under the
-  [SquareSquash organization](https://github.com/SquareSquash).
-* **Front-end:** This website displays Bug information and helps the engineer
-  find the root cause for a Bug, and fix it. It also lets engineers manage,
-  assign, and comment on Bugs, as well as view statistics about the Bug.
-* **API endpoints:** These routes (part of the front-end app) receive exception
-  notifications from the client libraries and process them.
-
-This project is the front-end and the API.
-
-Pull requests are more than welcome; please check out {file:CONTRIBUTING} for
-details.
-
-How to Install
---------------
-
-To get started, run the `setup.rb` file in the project root. This script will
-ask you a series of questions and generate a preliminary configuration for your
-site install. When the script is completed, you can run `git status` to see what
-files it changed, and refine your configuration from there.
-
-Once the script is complete, Squash should run for most typical development
-environments. Simply run `rails s` and visit the site in your Web browser. You
-should be able to start using it immediately. You can also verify correctness by
-running `rspec spec`.
-
-Configuring and deploying the production instance is entirely up to you and your
-particular production environment.
-
-Additional configuration options can be found in the following locations:
-
-* `config/application.rb`
-* `config/environments/*.rb`
-* `config/environments/*/*.yml`
-
-If you don't see what you're looking for in any of those files, you'll probably
-have to change the code to make it work. Don't be afraid -- the code is
-thoroughly documented and should (hopefully) be very accessible.
-
-### Requirements
-
-Squash requires the following:
-
-* Ruby 1.9.2 or newer (JRuby with `--1.9` is supported)
-* Multithreading support (see the next section)
-* PostgreSQL 9.0 or newer
-* The Bundler gem
-* Git 1.7 or newer
-
-### Notes on some of the gem and library choices
-
-**Why do you specifically require PostgreSQL?** Squash uses a lot of
-PostgreSQL-specific features to make efficient use of the database and maintain
-referential integrity, such as:
-
-* foreign key constraints,
-* triggered cached counters,
-* check constraints, and
-* semantic indexes for text-based search.
-
-If PostgreSQL is out of the question, some of these features can be ported to
-other RDBMSes; simply edit the `InitialSchema` migration and update the SQL as
-necessary. If portability is required, a lot of these features can be
-reimplemented in the Rails layer (e.g., cached counters), at the risk of
-degraded referential integrity. (If you are reimplementing the cached counters
-in Ruby, be sure to modify the `config/initializers/active_record.rb` file as
-appropriate.)
-
-If you do successfully port Squash to another RDBMS, let me know. I'd be happy
-to take your changes.
-
-**Why do you bundle an edge version of Rails?** The `3-2-stable` branch of Ruby
-on Rails includes some changes to Active Record that are required by Squash's
-multithreaded concurrency model (see next question). In particular, that version
-of Active Record includes crucial changes to the connection pool and connection
-reopening logic. If you do not wish to use edge Rails, you can drop the Gemfile
-entry back down to a release version, provided you are using an alternative
-concurrency model (e.g., Resque workers), or have backported the necessary
-changes. In the future, when these changes are released, the Gemfile will be
-altered.
-
-**Why do you use threads to accomplish background tasks instead of fibers or
-Resque workers?** Squash was originally built for Square, which runs all its
-services on JRuby. Using threads is very efficient in JRuby, and avoids the
-overhead of having to deploy both a website and workers.
-
-If you are running Squash in a non-thread-safe (or multithreading-unfriendly)
-environment, it should be easy to convert to a Resque-based environment. All
-threaded code is invoked using {BackgroundRunner.run}, which then uses the
-settings in the `concurrency.yml` Configoro file to invoke the correct module
-under `lib/background_runner`. The default is to use
-{BackgroundRunner::Multithread}, which uses the {Multithread} module to execute
-the task in its own thread. If you wish to use a different concurrency model,
-you can implement your own `BackgroundRunner` module and change the settings in
-the YAML file. See the {BackgroundRunner} documentation for more details.
-
-If you do this successfully and wish to save future Squash users the effort,
-feel free to turn your changes into a pull request.
-
-**Why aren't you using RedCarpet?** As mentioned above, Squash was originally
-built to run under JRuby. RedCarpet has compiled C extensions; Kramdown is pure
-Ruby.
-
-**Why do you require a recent version of Git?** Squash uses the
-`git clone --mirror` command to create local mirrors of client projects' Git
-repositories.
-
-**Why don't you have integration tests or acceptance tests?** To be 100% honest,
-lack of familiarity on these things in Ruby/Rails. Happy for any help people
-want to extend towards this goal.
-
-**Why are you using Erector?** I like Erector.
-
-Documentation
--------------
-
-Comprehensive documentation is written in YARD- and Markdown-formatted comments
-throughout the source. To view this documentation as an HTML site, run
-`rake yard`.
-
-CoffeeScript libraries are documented using the YARD format as well, but YARD
-does not as yet recognize them as documentable files. A `.codoopts` file is
-included in case you wish to use [Codo](https://github.com/netzpirat/codo) to
-generate the CoffeeScript docs, but as of now Codo does not recognize the ERb
-files, and does not use the full set of Markdown syntax features used in the
-documentation.
-
-Project Overview
-----------------
-
-### Views
-
-This is a pretty typical Rails website, save for the views, which are written
-using Erector. The views forgo the traditional Rails concepts of partials and
-templates in favor of analogous OOP concepts more familiar to software
-developers: methods and inheritance. All views inherit from an abstract Erector
-widget which provides layout; and all views have their content split into
-multiple private methods.
-
-In addition to the usual helpers (in `app/helpers`), there are view mixins under
-`app/views/additions` that simplify view coding.
-
-Embedded code snippets are all rendered using the {ProjectsController#context}
-action. This action loads the appropriate file and revision from the Git
-repository and returns a snippet plus the name of the SyntaxHighlighter brush to
-use. The brush is determined from the file name/extension; the mapping can be
-found in `data/brushes.yml`.
-
-This view behavior is provided from a JavaScript library file in
-`lib/assets/javascripts`. There are many similar helper classes in there; they
-are documented but the documentation is not recognized by YARD and so is not
-included in this documentation set.
-
-JavaScript files are organized into four possible locations:
-
-* Third-party JavaScript libraries are in `vendor/assets/javascripts` and
-  loaded in the `application.js` manifest.
-* JavaScript modules or helpers that are not specific to a particular page or
-  site area are in `lib/assets/javascripts` and also loaded in `application.js`.
-* JavaScript modules or helpers specific to a particular area of the site are in
-  `app/assets/javascripts` and also loaded in `application.js`.
-* Small JavaScript snippets, glue code, or other code intended to add dynamic
-  behavior to a specific page is in a `.js` file named the same as, and placed
-  alongside, the `.html.rb` view file. For example, if
-  `app/views/projects/new.html.rb` needed a bit of JS glue code, it would be
-  placed in `app/views/projects/new.js`. This code is placed in a `<SCRIPT>` tag
-  at the end of the view by the {Views::Layouts::Application#inline_javascript}
-  method.
-
-CSS files are similarly organized:
-
-* Third-party CSS files are in `vendor/assets/stylesheets` and loaded in the
-   `application.css` manifest.
-* CSS styles or helpers global to the entire website are in
-  `lib/assets/stylesheets` and also loaded in `application.css`.
-* CSS styles specific to a single page or a related group of pages are placed in
-  `app/assets/stylesheets` and also loaded in `application.css`. Each `<BODY>`
-  tag is given a class name equal to the controller name, and an ID equal to
-  the controller and action name separated with a dash. For instance, the
-  `projects/new` action's body would be `<body class=projects id=projects-new>`.
-
-### Controllers
-
-For information about requests and responses, see {ApplicationController}.
-
-### Models
-
-Models make extensive use of advanced PostgreSQL features for efficiency and
-convenience. Cached counters are updated using triggers and rules, foreign key
-constraints and hooks are enforced at the database level, and validations are
-backed up by corresponding `CHECK` triggers. This helps ensure referential and
-data integrity even in situations where Rails fails, or outside of the Rails
-stack. See the various migrations to learn more about the triggers, rules, and
-constraints being used.
-
-Observers are used for more high-level triggers, such as creating {Event Events}
-at the appropriate times, or sending emails. See the classes in
-`app/models/observers` for more.
-
-Models also use the HasMetadataColumn gem to reduce their width and incorporate
-schemaless data. Most models have a JSON-formatted `metadata` column to which
-new information can be added or removed without having to create new migrations.
-
-### Tasks
-
-Various Rake tasks are available under `lib/tasks`. These include tasks for
-pruning and maintaining the database, development tasks, and configuring the
-workers.
-
-### Workers
-
-Workers are found in the `lib/workers` directory. Along with OccurrencesWorker,
-which stores and categorizes Occurrences, there are other workers for managing
-Deploys and other minor tasks. These workers are run asynchronously using
-{Multithread}.
-
-### Mailers
-
-Notification mails are sent by the {NotificationMailer}. It and any other
-mailers live in `app/mailers`.
-
-`NotificationMailer` conditionally delivers emails. An email will only be
-delivered if all of the following conditions are met:
-
-* The Project has a mailing list email configured (for the critical-bugs and
-  all-bugs mailing lists),
-* the Environment's `sends_emails` attribute is `true`, and
-* the User has enabled receipt of that category of emails (typically specified
-  in the Membership).
-
-### Authentication and Authorization
-
-Authentication is done using either password verification or LDAP; see
-{AuthenticationHelpers} and related controller mixins, as well as the
-model mixins under `app/models/additions` for more information.
-
-There are four permissions levels that a User can have, specific to an
-individual Project:
-
-**Non-members** do not have a {Membership} record with a Project. They can view
-Bugs and Occurrences, view the Project's API key, view the list of other
-Project members, watch Bugs, and comment on Bugs.
-
-**Members** can do everything non-members can do, and can also assign Bugs, be
-assigned Bugs, and modify/delete Bugs.
-
-**Administrators** can do everything members can do, and can also modify
-Project and Environment settings, regenerate the API key, promote and demote
-members to administrator status, and modify/delete others' Comments.
-
-**Owners** (each Project has only one) can do everything administrators can do,
-and can also delete the Project and reassign ownership.
-
-Recording and Categorizing Occurrences
---------------------------------------
-
-### Client-Specific Information
-
-The client library identifiers used throughout the website determine how a Bug
-reported from that library is presented in the view. The
-{OccurrencesController::INDEX_FIELDS} constant maps a client library identifier
-to the relevant summary fields to display in the list view.
-
-Each occurrence is transmitted with the name of the client library; the
-{Occurrence} records this to the `client` field. The {Bug}'s `client` field is
-set from the first Occurrence's; in general, one should expect that all
-Occurrences of a Bug share the same client value.
-
-Regardless of the Occurrence's client value, all fields for which there is data
-are displayed in the Occurrence view.
-
-If a client library is updated to add new information fields, all that is needed
-is to update the `has_metadata` hash in Occurrence with the new fields, and to
-update the `occurrences#show` view as necessary. (The `INDEX_FIELDS` hash can
-also be updated as appropriate.)
-
-If a new client library is added, in addition to doing the above for any new
-fields unique to the new client, the `INDEX_FIELDS` hash will need to be
-expanded to include the new client.
-
-### Queue Consumer
-
-For information about the background worker that converts incoming exception
-information into Occurrence and Bug records (including doing "best guess" commit
-blaming, determining which Occurrences share the same root Bug, etc.), see the
-documentation for the {OccurrencesWorker} module. See also **Static Analysis**
-below.
-
-### Deploys and Releases
-
-Squash can handle both _deployed_ projects (hosted projects for which typically
-only one version is live at a time) and _released_ projects (distributed apps
-for which many versions may exist "in the wild").
-
-If you are developing a released project, you must associate your {Deploy}
-objects with a unique version identifier (such as a build number). You must also
-send the correct build identifier with every occurrence report. See the client
-library and API controller documentation for more information.
-
-Once this is done, Squash's behavior is changed slightly: Bugs that are fixed
-in an older release, but recur, are not reopened. Bugs that are fixed in an
-older release but then recur in newer releases are treated as completely
-separate Bugs.
-
-This app exposes an API endpoint for notifying Squash of new releases/deploys of
-your Project. You should notify Squash whenever you deploy your Project (or
-release a new version) so that it can properly manage Bugs (automatically mark
-fixed Bugs as deployed, associate new Bugs with the new Deploy, etc.).
-
-Most client libraries include an easy means to add this feature to your deploy
-or release process.
-
-Static Analysis
----------------
-
-### Message Normalization
-
-When an Occurrence is grouped into a Bug, its message is stripped of any
-non-relevant or situational information. (Note that since the message is not
-used as a dimension in grouping Occurrences, two Occurrences of the same Bug
-could have completely different messages. A Bug gets its message from its first
-Occurrence.) This is done by the {Blamer}.
-
-For most messages, this is done using simple regex subsitution. Squash can also
-normalize an exception's message using a list of known message templates. Such
-templates are stored in the `data/message_templates.yml` file. The file contains
-a hash mapping exception class names to an array of arrays. Each inner array
-contains two elements: the regexp to match the exception message on, and the
-replacement message should it match.
-
-These templates are evaluated in the order they appear in the array. Scripts
-that regenerate the templates for MySQL and PostgreSQL error strings can be
-found under the `script` directory.
-
-### Version Control Systems
-
-As of now, Squash is only compatible with projects that are version-controlled
-using Git. However, in the interest of remaining as VCS-agnostic as possible,
-commit identifiers are never called "SHA1s," but instead "IDs."
-
-### Unsymbolicated, Obfuscated, or Minified Stack Traces
-
-Client libraries of compiled, obfuscated, or minified applications will need to
-convert their stack traces in order for them to be of use for static analysis.
-Because release builds are typically not distributed with embedded decompilation
-information, a mapping or table must be given to Squash, so that when Squash
-receives an unconverted stack trace, it can perform lookups and convert it to a
-more usable format.
-
-Currently, the supported conversions are:
-
-* symbolication of iOS exceptions (see {Symbolication}),
-* deobfuscation of Java exceptions (see {ObfuscationMap}),
-* and source-mapping of JavaScript exceptions (see {SourceMap}).
-
-Client libraries are responsible for delivering the raw stack trace data to
-Squash when an exception occurs, and for delivering lookup tables to Squash upon
-each new release. {Api::V1Controller} has endpoints for these purposes in
-various languages.
-
-Unconverted stack traces are stored in a particular format; see {Occurrence} for
-more information. When a new exception with a stack trace in this format is
-received, Squash immediately attempts to convert it using an existing matching
-lookup table. If no such table is found, the stack trace is left unconverted. It
-can still be viewed on the front end. When, later, a new lookup table is added,
-Squash automatically finds and converts any matching stack traces.
-
-Because every new Occurrence must be assigned a Bug (including unconverted
-Occurrences), it is possible that the "blamed" `file` and `line` fields of the
-Bug could themselves be unconverted. The {Bug} class has provisions to support
-this; see in particular `bugs.special_file`.
-
-Specs
------
-
-All models, controllers, and library files are unit-tested with RSpec specs
-under the `spec` directory. Run unit tests with the `rspec spec` command. Views
-and JavaScript files are not specced. No integration or acceptance tests are
-written. Almost all unit tests use factories rather than mocks, putting them
-somewhat closer to integration tests.
-
-In general, the test environment is identical to the development/production
-environment, save for the usual Rails allowances, and the
-`config/initializers/active_record_observer_hooks.rb` file. This file adds
-after-commit hooks to observers (identical to those available to models).
-However, specs are transactionalized, meaning that these hooks wouldn't run
-until after the spec is completed, resulting in multiple spec failures.
-
-To remedy this, the file introspects on the environment, and instead links the
-observer hooks to the `after_save` model hooks in the test environment. This
-differentiates the test and live environments, but allows specs to pass.
-
-If you wish to bring your test environment closer to production, you can set
-the `use_transactional_fixtures` RSpec setting to false. The hooks file will
-automatically detect the change and use the correct `after_commit` hooks.
-Currently, all specs pass with and without transactionalized fixtures.
-
-Third-Party Integrations
-------------------------
-
-Squash supports integration with a handful of popular other developer tools.
-
-### PagerDuty
-
-When Squash is integrated with PagerDuty, it will begin sending exceptions to
-PagerDuty once the Occurrence count for a given Bug exceeds the Project's
-critical threshold. Thereafter, every Occurrence is sent to PagerDuty as a
-trigger. The triggers are grouped into alerts by Bug, so users will only be
-paged once per new error.
-
-In addition, marking a Bug fixed will also automatically resolve its associated
-PagerDuty alert (if any), and assigning a Bug or marking it irrelevant
-automatically acknowledges any associated PagerDuty alert.
-
-In order to integrate Squash with PagerDuty, you must
-
-1. generate an API key that Squash can use for PagerDuty access (you must be a
-   PagerDuty admin to do this),
-2. update the `config/environments/common/pagerduty.yml` file to enable
-   PagerDuty integration and provide the API key,
-3. configure Generic API services for each escalation policy you wish to use,
-   and
-4. set the PagerDuty-related options in your Project's configuration page.
-
-### JIRA
-
-When Squash is integrated with JIRA, users have the option of associating a JIRA
-issue with any Bug. The Management tab will then display a link allowing the
-user to quickly view the associated issue.
-
-In addition, the user can have Squash watch the JIRA issue for status updates.
-Once the JIRA issue is resolved (or is changed to someother specified status),
-the Bug can be automatically marked as fixed. By associating multiple Bugs with
-one JIRA issue in such a manner, a user can quickly fix a large number of Bugs
-by closing just one JIRA issue.
-
-Finally, a "Create JIRA Issue" button is provided on the Management tab allowing
-users to easily create new JIRA issues for any Bug.
-
-In order to integrate Squash with JIRA, you must
-
-1. configure the `config/environments/common/jira.yml` file with your
-   JIRA authentication credentials and installation location, and
-2. add a cron job or other periodic task that runs `rake jira:update`.
-
-JIRA integration works out-of-the-box if you use username/password
-authentication. OAuth authentication requires a few more steps. Because OAuth
-authentication requires user actions, you will need to obtain an access token
-and secret which the JIRA client can use without needing to prompt the user. You
-can do this by running the `jira_oauth.rb` script:
-
-```` ruby
-rails runner script/jira_oauth.rb
-````
-
-Follow the instructions to set up your JIRA integration.
diff --git a/doc/fdoc/sourcemap-POST.fdoc b/doc/fdoc/sourcemap-POST.fdoc
index c93d5198..82114670 100644
--- a/doc/fdoc/sourcemap-POST.fdoc
+++ b/doc/fdoc/sourcemap-POST.fdoc
@@ -18,9 +18,7 @@ requestParameters:
   properties:
     sourcemap:
       description: |
-        A `Squash::Javascript::SourceMap` object (as generated using the
-        `squash_javascript` gem), YAML-serialized, then gzipped, then base
-        64-encoded.
+        A JSON-serialized source map, gzipped, then base 64-encoded.
       required: true
       type: string
       example: "eJxj4ci3UgguLE0szvBKLEssTi7KLCixsgrOLy1KTvVNLGCz4nPITSwoyMxL\nL45mAABqrw+t\n"
@@ -41,3 +39,18 @@ requestParameters:
       required: true
       type: string
       example: 2dc20c984283bede1f45863b8f3b4dd9b5b554cc
+    from:
+      description: |
+        The type of generated JavaScript code this source map transforms from.
+        "hosted" should be used for the final hosted JS; other names are
+        arbitrary.
+      required: true
+      type: string
+      example: hosted
+    to:
+      description: |
+        The type of generated or human-written JavaScript/CoffeeScript code this
+        source map transforms to.
+      required: true
+      type: string
+      example: concatenated
diff --git a/lib/api/errors.rb b/lib/api/errors.rb
index 5f264e42..2c846c08 100644
--- a/lib/api/errors.rb
+++ b/lib/api/errors.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/accordion.js.coffee b/lib/assets/javascripts/accordion.js.coffee
index 0e1b48bd..4e3f5f6d 100644
--- a/lib/assets/javascripts/accordion.js.coffee
+++ b/lib/assets/javascripts/accordion.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/autocomplete.js.coffee b/lib/assets/javascripts/autocomplete.js.coffee
index 1ad93c2e..262ee5fc 100644
--- a/lib/assets/javascripts/autocomplete.js.coffee
+++ b/lib/assets/javascripts/autocomplete.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -46,13 +46,15 @@ class root.Autocomplete
     @element.wrap $('<div/>').css('position', 'relative')
     @element.attr 'autocomplete', 'off'
     @dropdown = $('<ul/>').addClass('autocomplete').appendTo(@element.parent())
-    @dropdown.css 'top', '' + @element.outerHeight() + 'px'
-    @dropdown.css 'width', '' + @element.outerWidth() + 'px'
 
     @itemList = this.renderItems(@options.suggestions)
     this.resetSelection()
 
-    @element.focus(=> @dropdown.addClass('shown')).blur =>
+    @element.focus( =>
+      @dropdown.css 'top', '' + @element.outerHeight() + 'px'
+      @dropdown.css 'width', '' + @element.outerWidth() + 'px'
+      @dropdown.addClass('shown')
+    ).blur =>
       @dropdown.oneTime 100, => @dropdown.removeClass('shown')
       # we add the delay to allow a click event to fire on an LI if we clicked
       # on it, before hiding the menu
@@ -88,7 +90,7 @@ class root.Autocomplete
     @dropdown.empty()
     items = $.map(items, (suggestion, idx) =>
       val = @options.fieldValue(suggestion)
-      li = $('<li/>').attr('data-id', val)
+      li = $('<li/>').data('id', val)
       @options.elementBuilder li, suggestion
       @dropdown.append li
       # have the selection follow the mouse cursor
diff --git a/lib/assets/javascripts/bug_file_formatter.js.coffee b/lib/assets/javascripts/bug_file_formatter.js.coffee
index 4eb81e38..8d7a9996 100644
--- a/lib/assets/javascripts/bug_file_formatter.js.coffee
+++ b/lib/assets/javascripts/bug_file_formatter.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -20,5 +20,9 @@ root = exports ? this
 # @return [String] The abbreviated file name.
 #
 root.formatBugFile = (bug) ->
-  parts = bug.file.split('/')
-  parts[parts.length  - 1]
+  #TODO don't guess, record this information
+  if bug.file.match(/^\[S\] /)
+    "<simple blamer>"
+  else
+    parts = bug.file.split('/')
+    parts[parts.length  - 1]
diff --git a/lib/assets/javascripts/buttons.js.coffee b/lib/assets/javascripts/buttons.js.coffee
index d0d2bf6a..52e22032 100644
--- a/lib/assets/javascripts/buttons.js.coffee
+++ b/lib/assets/javascripts/buttons.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
 #    limitations under the License.
 
 # Any buttons with HREF attributes automatically act as links. These buttons can
-# also have a DATA-METHOD attribute like Rails magic links.
+# also have DATA-SQMETHOD and DATA-SQCONFIRM attributes similar to Rails magic
+# links.
 #
 jQuery.fn.autoButton =  ->
   for element in this
@@ -22,13 +23,13 @@ jQuery.fn.autoButton =  ->
         button = $(e.currentTarget)
 
         perform = true
-        if button.attr('data-confirm')
-          perform = confirm(button.attr('data-confirm'))
-        unless perform then return
+        if button.data('sqconfirm')
+          perform = confirm(button.data('sqconfirm'))
+        unless perform then return false
 
-        if button.attr('data-method')
+        if button.data('sqmethod')
           form = $('<form/>').attr(action: button.attr('href'), method: 'POST')
-          $('<input/>').attr(type: 'hidden', name: '_method', value: button.attr('data-method')).appendTo form
+          $('<input/>').attr(type: 'hidden', name: '_method', value: button.data('sqmethod')).appendTo form
           $('<input/>').attr(type: 'hidden', name: $('meta[name=csrf-param]').attr('content'), value: $('meta[name=csrf-token]').attr('content')).appendTo form
           form.submit()
         else
diff --git a/lib/assets/javascripts/configure_squash_client.js.coffee.erb b/lib/assets/javascripts/configure_squash_client.js.coffee.erb
new file mode 100644
index 00000000..127afcef
--- /dev/null
+++ b/lib/assets/javascripts/configure_squash_client.js.coffee.erb
@@ -0,0 +1,26 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http: //www.apache.org / licenses / LICENSE - 2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+<% unless Squash::Ruby.configuration :disabled %>
+    # first the settings imported from the ruby client
+    SquashJavascript.instance().configure
+        APIHost: "<%= Squash::Ruby.configuration(:api_host) %>"
+        APIKey: "<%= Squash::Ruby.configuration(:api_key) %>"
+        notifyPath: "<%= Squash::Ruby.configuration :notify_path %>"
+        environment: "<%= Rails.env %>"
+        revision: "<%= Squash::Ruby.current_revision %>"
+
+    # then the JavaScript-specific overrides
+    SquashJavascript.instance().configure <%= Squash::Configuration.javascript_dogfood.to_json %>
+<% end %>
diff --git a/lib/assets/javascripts/configure_squash_client.js.erb b/lib/assets/javascripts/configure_squash_client.js.erb
deleted file mode 100644
index a5a8e697..00000000
--- a/lib/assets/javascripts/configure_squash_client.js.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2012 Square Inc.
-//
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-//
-//        http://www.apache.org/licenses/LICENSE-2.0
-//
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-
-<% unless Squash::Ruby.send :configuration, :disabled %>
-  <% class SprocketsHelperMethods_; extend ActionView::Helpers::JavaScriptHelper; end %>
-
-  (function() {
-    // first the settings imported from the ruby client
-    SquashJavascript.instance().configure({
-      revision:    "<%= Squash::Ruby.send :current_revision %>",
-      APIKey:      "<%= Squash::Ruby.send :configuration, :api_key %>",
-      APIHost:     "<%= Squash::Ruby.send :configuration, :api_host %>",
-      notifyPath:  "<%= Squash::Ruby.send :configuration, :notify_path %>",
-      environment: "<%= Rails.env %>"
-    });
-
-    // then the JavaScript-specific overrides
-    SquashJavascript.instance().configure(<%= Squash::Configuration.javascript_dogfood.to_json %>);
-  })();
-<% end %>
diff --git a/lib/assets/javascripts/context.js.coffee b/lib/assets/javascripts/context.js.coffee
index 444a7963..c4944bbf 100644
--- a/lib/assets/javascripts/context.js.coffee
+++ b/lib/assets/javascripts/context.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -20,15 +20,14 @@ jQuery.fn.applyContext = ->
   for tag in this
     do (tag) ->
       element = $(tag)
-      $.ajax "/projects/#{element.attr 'data-project'}/context.json",
+      $.ajax "/projects/#{element.attr 'data-project'}/commits/#{element.data 'revision'}/context.json",
         type: 'GET'
         data: $.param
-          revision: element.attr('data-revision')
-          file: element.attr('data-file')
-          line: element.attr('data-line')
-          context: (element.attr('data-context') || 3)
+          file: element.data('file')
+          line: element.data('line')
+          context: (element.data('context') || 3)
         success: (snippet) ->
-          element.text(snippet.code).removeClass().addClass("brush: #{snippet.brush}; ruler: true; first-line: #{snippet.first_line}; highlight: #{element.attr('data-line')}; toolbar: false; unindent: false")
+          element.text(snippet.code).removeClass().addClass("brush: #{snippet.brush}; ruler: true; first-line: #{snippet.first_line}; highlight: #{element.data('line')}; toolbar: false; unindent: false")
           SyntaxHighlighter.highlight()
         error: (xhr) ->
           if xhr && xhr.responseText
diff --git a/lib/assets/javascripts/disclosure.js.coffee b/lib/assets/javascripts/disclosure.js.coffee
index 0228ef6a..4d31e4e0 100644
--- a/lib/assets/javascripts/disclosure.js.coffee
+++ b/lib/assets/javascripts/disclosure.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@ jQuery.fn.details = ->
       header = container.find('>summary')
       container.children(':not(summary)').wrapAll $('<div/>')
       content = container.find('>div')
-      triangle = $('<i/>').addClass('icon-play').prependTo(header)
+      triangle = $('<i/>').addClass('fa fa-play').prependTo(header)
       shown = false
 
-      if container.attr('data-open')
+      if container.data('open')
         triangle.css("-#{browser}-transform", "rotate(90deg)") for browser in ['webkit', 'moz', 'o']
         shown = true
       else
@@ -36,15 +36,3 @@ jQuery.fn.details = ->
         shown = !shown
         content.slideToggle()
   this
-
-# Adds disclosure-triangle support to a DETAILS tag if native support does not
-# exist.
-#
-jQuery.fn.detailsIfNecessary = ->
-  if navigator.userAgent.indexOf('Chrome') != -1 then return this
-  if navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Version/6.0') != -1 then return this
-  this.details()
-
-
-$(document).ready ->
-  $('details').detailsIfNecessary()
diff --git a/lib/assets/javascripts/dropdown.js.coffee b/lib/assets/javascripts/dropdown.js.coffee
index a7302d5f..384f95a5 100644
--- a/lib/assets/javascripts/dropdown.js.coffee
+++ b/lib/assets/javascripts/dropdown.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -18,29 +18,30 @@
 # `display: none` without the "shown" class./
 #
 $(window).ready ->
+  roll_everything_up = ->
+    $('a[rel=dropdown]>.fa-chevron-up').removeClass('fa fa-chevron-up').addClass 'fa fa-chevron-down'
+    $('nav .shown').removeClass 'shown'
+
   # Clicking on a dropdown link toggles the dropdown
   $('a[rel=dropdown]').click (e) ->
     link = $(e.currentTarget)
     target = $(link.attr('href'))
 
+    roll_everything_up()
     target.toggleClass('shown')
     if target.hasClass('shown')
-      link.find('.icon-chevron-down').removeClass('icon-chevron-down').addClass 'icon-chevron-up'
-      if link.hasClass('icon-chevron-down')
-        link.removeClass('icon-chevron-down').addClass 'icon-chevron-up'
-    else
-      link.find('.icon-chevron-up').removeClass('icon-chevron-up').addClass 'icon-chevron-down'
-      if link.hasClass('icon-chevron-up')
-        link.removeClass('icon-chevron-up').addClass 'icon-chevron-down'
+      link.find('.fa-chevron-down').removeClass('fa fa-chevron-down').addClass 'fa fa-chevron-up'
+
+    e.preventDefault()
+    return false
 
   # Clicking elsewhere hides all dropdowns
   $('body').click (e) =>
     # don't roll up dropdowns if we are clicking inside a dropdown
     return if $(e.target).closest('[rel=dropdown]').length > 0
-    return if $(e.target).closest('.shown').length > 0
+    return if $(e.target).closest('nav .shown').length > 0
 
-    $('a[rel=dropdown]>.icon-chevron-up').removeClass('icon-chevron-up').addClass 'icon-chevron-down'
-    $('.shown').removeClass 'shown'
+    roll_everything_up()
 
     return true
 
@@ -49,17 +50,17 @@ $(window).ready ->
 # other tab items are not shown, but clicking this button toggles the
 # "full-size-only" class on all sibling `<LI>`s.
 #
-# The class of the link itself ("icon-chevron-down" or "icon-chevron-up") is
-# used to track the state of the menu.
+# The class of the link itself ("fa-chevron-down" or "fa-chevron-up") is used to
+# track the state of the menu.
 #
 $(window).ready ->
   $('a[rel="list-expansion"]').click (e) ->
     link = $(e.currentTarget)
     lis = link.closest('li').siblings('li')
 
-    if link.hasClass('icon-chevron-down')
+    if link.hasClass('fa-chevron-down')
       lis.removeClass 'full-size-only'
-      link.removeClass('icon-chevron-down').addClass 'icon-chevron-up'
+      link.removeClass('fa fa-chevron-down').addClass 'fa fa-chevron-up'
     else
       lis.addClass 'full-size-only'
-      link.removeClass('icon-chevron-up').addClass 'icon-chevron-down'
+      link.removeClass('fa fa-chevron-up').addClass 'fa fa-chevron-down'
diff --git a/lib/assets/javascripts/dynamic_search_field.js.coffee b/lib/assets/javascripts/dynamic_search_field.js.coffee
index b9295f37..7d0939fb 100644
--- a/lib/assets/javascripts/dynamic_search_field.js.coffee
+++ b/lib/assets/javascripts/dynamic_search_field.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/editor_links.js.coffee b/lib/assets/javascripts/editor_links.js.coffee
index 94842899..40a75042 100644
--- a/lib/assets/javascripts/editor_links.js.coffee
+++ b/lib/assets/javascripts/editor_links.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -30,10 +30,10 @@ jQuery.fn.editorLink = ->
       element = $(tag)
       url = null
       command = null
-      file = element.attr('data-file')
-      line = element.attr('data-line')
-      project = element.attr('data-project')
-      editor = element.attr('data-editor')
+      file = element.data('file')
+      line = element.data('line')
+      project = element.data('project')
+      editor = element.data('editor')
 
       if editor == 'textmate'
         url = (file) -> "txmt://open?" + $.param({url: file, line: line})
@@ -51,6 +51,10 @@ jQuery.fn.editorLink = ->
         url = (file) -> "emacs://open?" + $.param({url: "file://#{file}", line: line})
         command = "emacs +#{line} #{shellEscape(file)}"
         element.attr('title', "This link requires EmacsURLHandler to work.").tooltip()
+      else if editor == 'rubymine'
+        url = (file) ->
+          "x-mine://open?" + $.param({url: "file://#{file}", line: line})
+        command = "mine #{shellEscape(file)}:#{line}"
       else
         return
 
diff --git a/lib/assets/javascripts/email_alias_form.js.coffee.erb b/lib/assets/javascripts/email_alias_form.js.coffee
similarity index 99%
rename from lib/assets/javascripts/email_alias_form.js.coffee.erb
rename to lib/assets/javascripts/email_alias_form.js.coffee
index c82273f8..617e446d 100644
--- a/lib/assets/javascripts/email_alias_form.js.coffee.erb
+++ b/lib/assets/javascripts/email_alias_form.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/error_tooltip.js.coffee b/lib/assets/javascripts/error_tooltip.js.coffee
index c64001c4..a37db6e1 100644
--- a/lib/assets/javascripts/error_tooltip.js.coffee
+++ b/lib/assets/javascripts/error_tooltip.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/feed.js.coffee b/lib/assets/javascripts/feed.js.coffee
index 393135bb..abe49558 100644
--- a/lib/assets/javascripts/feed.js.coffee
+++ b/lib/assets/javascripts/feed.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ class root.Feed
       success: (events) =>
         if events.length == 0
           p = $('<p/>').addClass('no-results').text(" bugs to populate your feed.").appendTo(@element)
-          $('<i/>').addClass('icon-star').prependTo p
+          $('<i/>').addClass('fa fa-star').prependTo p
           return
 
         last_bug_url = null
@@ -57,7 +57,7 @@ class root.Feed
             last_bug_url = event.bug.url if @options.bugHeader
 
             li = $('<li/>').addClass('event').appendTo(last_group_ul)
-            $('<i/>').addClass("icon-#{event.icon}").appendTo li
+            $('<i/>').addClass("fa fa-#{event.icon}").appendTo li
             p = $('<div/>').addClass('event-content').appendTo(li)
             if event.kind == 'open'
               this.renderOpenEvent event, p
diff --git a/lib/assets/javascripts/form_with_errors.js.coffee b/lib/assets/javascripts/form_with_errors.js.coffee
index b43f8882..6ceb6ccb 100644
--- a/lib/assets/javascripts/form_with_errors.js.coffee
+++ b/lib/assets/javascripts/form_with_errors.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/live_update.js.coffee b/lib/assets/javascripts/live_update.js.coffee
index 27c1e511..d256ae8c 100644
--- a/lib/assets/javascripts/live_update.js.coffee
+++ b/lib/assets/javascripts/live_update.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ jQuery.fn.liveUpdate = (endpoint, handler, options) ->
             element.effect('highlight')
         error: =>
           element.empty()
-          if options.showWhenError then $('<i/>').addClass('icon-exclamation-sign').appendTo element
+          if options.showWhenError then $('<i/>').addClass('fa fa-exclamation-circle').appendTo element
 
   liveUpdates.push updater
   $(document).stopTime 'liveUpdate'
diff --git a/lib/assets/javascripts/member_panel.js.coffee b/lib/assets/javascripts/member_panel.js.coffee
index d04cb5fd..597774a5 100644
--- a/lib/assets/javascripts/member_panel.js.coffee
+++ b/lib/assets/javascripts/member_panel.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -86,23 +86,23 @@ class root.MemberPanel
       error: -> new Flash('alert').text("Couldn’t load search results.")
 
   changeUser: (username, new_role, search_query) ->
-    if new_role == 'member' # put to membership, admin=false
+    if new_role == 'member' # patch to membership, admin=false
       $.ajax @membership_endpoint.replace('USERID', username),
-        type: 'PUT'
+        type: 'PATCH'
         data: $.param({'membership[admin]': 'false'})
         error: => Flash('alert').text("Couldn’t demote #{username} from administrator.")
         complete: => @processFilterSearchResults(search_query)
 
-    else if new_role == 'admin' # put to membership, admin=true
+    else if new_role == 'admin' # patch to membership, admin=true
       $.ajax @membership_endpoint.replace('USERID', username),
-        type: 'PUT'
+        type: 'PATCH'
         data: $.param({'membership[admin]': 'true'})
         error: => Flash('alert').text("Couldn’t promote #{username} to administrator.")
         complete: => @processFilterSearchResults(search_query)
 
-    else if new_role == 'owner' # put to project, owner_id=123
+    else if new_role == 'owner' # patch to project, owner_id=123
       $.ajax @project_endpoint,
-        type: 'PUT'
+        type: 'PATCH'
         data: $.param({'project[owner_username]': username})
         error: => Flash('alert').text("Couldn’t assign ownership to #{username}.")
         success: -> window.location.reload()
diff --git a/lib/assets/javascripts/smart_form.js.coffee b/lib/assets/javascripts/smart_form.js.coffee
index 9f2ad592..c9879b80 100644
--- a/lib/assets/javascripts/smart_form.js.coffee
+++ b/lib/assets/javascripts/smart_form.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/sortable_table.js.coffee b/lib/assets/javascripts/sortable_table.js.coffee
index 00186636..353eedc3 100644
--- a/lib/assets/javascripts/sortable_table.js.coffee
+++ b/lib/assets/javascripts/sortable_table.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -64,9 +64,9 @@ class root.SortableTable
         if column.sortable
           i = $('<i/>').appendTo(th)
           if @sort_key == column.key
-            if @sort_dir == 'asc' then i.addClass('icon-sort-up') else i.addClass('icon-sort-down')
+            if @sort_dir == 'asc' then i.addClass('fa fa-sort-up') else i.addClass('fa fa-sort-down')
           else
-            i.addClass('icon-sort')
+            i.addClass('fa fa-sort')
           th.addClass 'sortable'
           th.click =>
             this.sort column.key
@@ -74,7 +74,7 @@ class root.SortableTable
     $(window).scroll (e) =>
       if $(window).scrollTop() >= $(document).height() - $(window).height() && !@loading_more && @last && !@end_of_scroll
         @loading_more ||= $('<div/>').addClass('alert info').text(" Loading more…").insertAfter(@element)
-        $('<i/>').addClass('icon-refresh').prependTo(@loading_more)
+        $('<i/>').addClass('fa fa-refresh').prependTo(@loading_more)
         $.ajax @endpoint,
           data: $.param($.extend({}, this.additionalParams(), this.sortParameters(), { last: @last }))
           type: 'GET',
@@ -140,7 +140,7 @@ class root.SortableTable
         else
           column.sorted = false
     this.updateHead()
-    @element.find("#header-#{this.sortKey()}>i").removeClass().addClass('icon-refresh')
+    @element.find("#header-#{this.sortKey()}>i").removeClass().addClass('fa fa-refresh')
     this.refreshData()
 
   # @private
@@ -148,8 +148,8 @@ class root.SortableTable
     @element.find('thead>tr>th').removeClass('sorted')
     @element.find('thead>tr>th>i').remove()
     @element.find("#header-#{this.sortKey()}").addClass 'sorted'
-    $('<i/>').addClass("icon-sort-#{if this.sortDir() == 'asc' then 'up' else 'down'}").appendTo @element.find("#header-#{this.sortKey()}")
-    $('<i/>').addClass("icon-sort").appendTo @element.find("thead>tr>th.sortable[id!=header-#{this.sortKey()}]")
+    $('<i/>').addClass("fa fa-sort-#{if this.sortDir() == 'asc' then 'up' else 'down'}").appendTo @element.find("#header-#{this.sortKey()}")
+    $('<i/>').addClass("fa fa-sort").appendTo @element.find("thead>tr>th.sortable[id!=header-#{this.sortKey()}]")
 
   # @private
   sortKey: ->
diff --git a/lib/assets/javascripts/tabs.js.coffee b/lib/assets/javascripts/tabs.js.coffee
index 1169cb31..be1dfdeb 100644
--- a/lib/assets/javascripts/tabs.js.coffee
+++ b/lib/assets/javascripts/tabs.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/assets/javascripts/utilities.js.coffee b/lib/assets/javascripts/utilities.js.coffee
index 3143dedd..81b14c82 100644
--- a/lib/assets/javascripts/utilities.js.coffee
+++ b/lib/assets/javascripts/utilities.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ root.distanceOfTimeInWords = (from_time, to_time, include_seconds=false) ->
 # Returns whether or not the given year is a leap year.
 #
 # @example
-#   isLeapYear(2012) #=> true
+#   isLeapYear(2013) #=> true
 #
 # @param [Integer] year The year.
 # @return [true, false] Whether it was a leap year.
diff --git a/lib/assets/javascripts/value_inspector.js.coffee b/lib/assets/javascripts/value_inspector.js.coffee
index 213e1b28..9a93f3d2 100644
--- a/lib/assets/javascripts/value_inspector.js.coffee
+++ b/lib/assets/javascripts/value_inspector.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -27,12 +27,12 @@ class root.ValueInspector
 
   # @private
   constructor: (@element) ->
-    @object = JSON.parse(@element.attr('data-object'))
+    @object = @element.data('object')
     if typeof @object == 'string'
       @element.append(@object.slice(0, 50) + '&hellip;')
       $('<br/>').appendTo @element
       @object = { to_s: @object }
-    $('<i/>').addClass('icon-search').appendTo @element
+    $('<i/>').addClass('fa fa-search').appendTo @element
     $('<a/>').text("View in Value Inspector").appendTo(@element).click =>
       this.show()
       false
@@ -128,7 +128,7 @@ class root.ValueInspector
   buildJSONFields: (object, open=false) ->
     if object && typeof object == 'object'
       details = $('<details/>')
-      if open then details.attr('data-open', 'open')
+      if open then details.data('open', 'open')
       $('<summary/>').text(object.constructor.toString().match(/^function (\w+)/)[1]).appendTo details
       table = $('<table/>').appendTo(details)
       for name, value of object
@@ -136,7 +136,7 @@ class root.ValueInspector
           tr = $('<tr/>').appendTo(table)
           $('<td/>').append($('<tt />').text(name)).appendTo tr
           $('<td/>').append(this.buildJSONFields(value)).appendTo tr
-      details.detailsIfNecessary()
+      details
     else
       $('<span/>').text(if typeof object == 'undefined' then 'undefined' else if typeof object == 'object' then 'null' else object.toString())
 
diff --git a/lib/background_runner.rb b/lib/background_runner.rb
index fb220bb8..5c8c6f7a 100644
--- a/lib/background_runner.rb
+++ b/lib/background_runner.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/background_runner/job.rb b/lib/background_runner/job.rb
new file mode 100644
index 00000000..3a5ef207
--- /dev/null
+++ b/lib/background_runner/job.rb
@@ -0,0 +1,39 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+module BackgroundRunner
+
+  # Mixin included into every worker that operates with {BackgroundRunner}.
+
+  module Job
+    extend ActiveSupport::Concern
+
+    included do
+      if BackgroundRunner.runner.respond_to?(:extend_job)
+        # call extend_job for this class...
+        BackgroundRunner.runner.extend_job self
+
+        # ... and all subclasses ...
+        subclasses.each { |klass| BackgroundRunner.runner.extend_job klass }
+
+        # ... and all future subclasses
+        class_eval <<-RUBY
+        def self.inherited(subclass)
+          BackgroundRunner.runner.extend_job subclass
+        end
+        RUBY
+      end
+    end
+  end
+end
diff --git a/lib/background_runner/multithread.rb b/lib/background_runner/multithread.rb
index cecef549..b2f8e8d6 100644
--- a/lib/background_runner/multithread.rb
+++ b/lib/background_runner/multithread.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-
 module BackgroundRunner
 
   # BackgroundRunner adapter for {::Multithread}. This module generates
diff --git a/lib/background_runner/resque.rb b/lib/background_runner/resque.rb
new file mode 100644
index 00000000..2fec08d3
--- /dev/null
+++ b/lib/background_runner/resque.rb
@@ -0,0 +1,62 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+module BackgroundRunner
+
+  # `BackgroundRunner` adapter for the Resque job system. See the
+  # `concurrency.yml` Configoro file for configuration options.
+
+  module Resque
+    def self.setup
+      rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
+      rails_env  = ENV['RAILS_ENV'] || 'development'
+
+      common_file = File.join(rails_root.to_s, 'config', 'environments', 'common', 'concurrency.yml')
+      env_file    = File.join(rails_root.to_s, 'config', 'environments', rails_env, 'concurrency.yml')
+
+      config = YAML.load_file(common_file)
+      if File.exist?(env_file)
+        config.merge! YAML.load_file(env_file)
+      end
+
+      ::Resque.redis = config['resque'][rails_env]
+      ::Resque.inline = true if rails_env == 'test'
+    end
+
+    def self.run(job_name, *arguments)
+      job_name = job_name.constantize unless job_name.kind_of?(Class)
+      ::Resque.enqueue job_name.const_get(:ResqueAdapter), *arguments
+    end
+
+    def self.extend_job(mod)
+      resque_adapter = Class.new
+      resque_adapter.instance_variable_set :@queue, Squash::Configuration.concurrency.resque.queue[mod.to_s]
+      resque_adapter.singleton_class.send(:define_method, :perform) do |*args|
+        mod.perform *args
+      end
+
+      mod.const_set :ResqueAdapter, resque_adapter
+    end
+  end
+end
+
+if Squash::Configuration.concurrency.background_runner == 'Resque'
+  # If we're loading resque-web using this file, we'll need to run setup manually
+  #
+  # resque-web lib/background_runner/resque.rb
+
+  if !ARGV.empty? && File.expand_path(ARGV.first, Dir.getwd) == File.expand_path(__FILE__, Dir.getwd)
+    BackgroundRunner::Resque.setup
+  end
+end
diff --git a/lib/background_runner/sidekiq.rb b/lib/background_runner/sidekiq.rb
new file mode 100644
index 00000000..a529ca0c
--- /dev/null
+++ b/lib/background_runner/sidekiq.rb
@@ -0,0 +1,71 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+module BackgroundRunner
+
+  # `BackgroundRunner` adapter for the Sidekiq job system. See the
+  # `concurrency.yml` Configoro file for configuration options.
+  #
+  # If you are using Sidekiq, you will need to run `rake sidekiq:configure` as
+  # part of your deploy process in order to generate the `config/sidekiq.yml`
+  # file. To do this in Capistrano, add something like this to your
+  # `config/deploy.rb` file:
+  #
+  # ```` ruby
+  # namespace :sidekiq do
+  #   task :configure do
+  #     run "cd #{release_path} && rake sidekiq:configure RAILS_ENV=#{rails_env}"
+  #   end
+  # end
+  # before 'sidekiq:restart', 'sidekiq:configure'
+  # ````
+
+  module Sidekiq
+    def self.setup
+      ::Sidekiq.configure_server do |config|
+        config.redis = Squash::Configuration.concurrency.sidekiq.redis
+      end
+
+      ::Sidekiq.configure_client do |config|
+        config.redis = Squash::Configuration.concurrency.sidekiq.redis
+      end
+
+      require 'sidekiq/testing/inline' if Rails.env.test?
+    end
+
+    def self.run(job_name, *arguments)
+      job_name = job_name.constantize unless job_name.kind_of?(Class)
+      job_name.const_get(:SidekiqAdapter).perform_async *arguments
+    end
+
+    def self.extend_job(mod)
+      # this could be a subclass whose superclass already included
+      # BackgroundRunner::Job; in that case, to ensure we define a sidekiq
+      # adapter unique to this subclass, we remvoe and redefine the adapter
+      mod.send :remove_const, :SidekiqAdapter rescue nil
+
+      mod.class_eval <<-RUBY
+        class SidekiqAdapter
+          include ::Sidekiq::Worker
+          options = Squash::Configuration.concurrency.sidekiq.worker_options[#{mod.to_s.inspect}]
+          sidekiq_options(options.symbolize_keys) if options
+
+          def perform(*args)
+            #{mod.to_s}.perform *args
+          end
+        end
+      RUBY
+    end
+  end
+end
diff --git a/lib/background_runner/tasks/resque.rake b/lib/background_runner/tasks/resque.rake
new file mode 100644
index 00000000..8f199093
--- /dev/null
+++ b/lib/background_runner/tasks/resque.rake
@@ -0,0 +1,52 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'resque/tasks'
+require 'resque/pool/tasks'
+
+# We'll override the default pool task in order to use our Squash config
+Rake::Task['resque:pool'].clear
+
+namespace :resque do
+  task setup: :environment
+
+  task 'pool:setup' do
+    ActiveRecord::Base.connection.disconnect!
+    Resque::Pool.after_prefork do |_job|
+      ActiveRecord::Base.establish_connection
+    end
+  end
+
+  desc "Launch a pool of resque workers"
+  task pool: %w[resque:setup resque:pool:setup] do
+    require 'resque/pool'
+
+    rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
+    rails_env  = ENV['RAILS_ENV'] || 'development'
+
+    common_file = File.join(rails_root.to_s, 'config', 'environments', 'common', 'concurrency.yml')
+    env_file    = File.join(rails_root.to_s, 'config', 'environments', rails_env, 'concurrency.yml')
+
+    config = YAML.load_file(common_file)
+    if File.exist?(env_file)
+      config.merge! YAML.load_file(env_file)
+    end
+
+    if GC.respond_to?(:copy_on_write_friendly=)
+      GC.copy_on_write_friendly = true
+    end
+
+    Resque::Pool.new(config['resque']['pool']).start.join
+  end
+end
diff --git a/lib/background_runner/tasks/sidekiq.rake b/lib/background_runner/tasks/sidekiq.rake
new file mode 100644
index 00000000..c97f6318
--- /dev/null
+++ b/lib/background_runner/tasks/sidekiq.rake
@@ -0,0 +1,22 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+namespace :sidekiq do
+  desc "Writes a Sidekiq configuration file into config/sidekiq.yml"
+  task configure: :environment do
+    File.open(Rails.root.join('config', 'sidekiq.yml'), 'w') do |f|
+      f.puts Squash::Configuration.concurrency.sidekiq.redis.except('url').symbolize_keys.to_yaml
+    end
+  end
+end
diff --git a/lib/blamer.rb b/lib/blamer.rb
deleted file mode 100644
index ff7eeab1..00000000
--- a/lib/blamer.rb
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 2012 Square Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-# This class analyzes an Occurrence and determines which Bug is responsible. A
-# new Bug is created if no existing Bug matches the search criteria.
-#
-# Usage
-# -----
-#
-# To re-calculate blame for an existing Occurrence, and potentially re-assign it
-# to a different Bug, it is sufficient to pass the Occurrence to this class's
-# initializer.
-#
-# To assign blame to a new, unsaved Occurrence, it will be necessary to create
-# an unsaved Bug and fill it out with the data Blamer needs in order to perform
-# its search. This data is:
-#
-# * the Bug's `environment`,
-# * the Bug's `class_name`, and
-# * the Bug's `deploy`, if any.
-#
-# This new Bug should be temporarily associated with the Occurrence before the
-# Occurrence is given to Blamer. The result of the {#find_or_create_bug!} method
-# will always be a different, saved Bug; you should leave your temporary Bug
-# unsaved.
-#
-# Matching to a Bug
-# -----------------
-#
-# In order to match an Occurrence to a Bug, the line number of the backtrace
-# that is at fault must first be determined. This is done probabilistically, by
-# assigning a score to each line of the backtrace and picking the line with
-# the highest score. Currently, the factors that influence a line's score are
-#
-# * the "height" of that line in the backtrace, and
-# * the age of the commit that most recently modified that line.
-#
-# The highest-scoring file and line number are termed the **relevant file** and
-# **relevant line**.
-#
-# An Occurrence is matched to a Bug using three mandatory criteria:
-#
-# * the relevant file path,
-# * the relevant line number, and
-# * the class name of the raised exception.
-#
-# In addition, if a "blamed" commit is available for the relevant file and line,
-# the bug is matched on that commit ID as well. Note that the exception message
-# is _not_ included in the search criteria.
-#
-# While each Occurrence maintains the original exception message, the Bug
-# filters the exception message to remove occurrence-specific information. There
-# are two ways of filtering exception messages:
-#
-# * If the exception can be filtered using {MessageTemplateMatcher}, that
-#   filtered message is used.
-# * Otherwise, a general search-and-replace is used to replace likely
-#   occurrence-specific information (like numbers, inspect values, etc.) with
-#   placeholders.
-#
-# All placeholders take the form "[ALL CAPS IN BRACKETS]" so that the view can
-# recognize them as such and format them appropriately.
-#
-# Deployed Projects
-# -----------------
-#
-# For Occurrences that come from Projects deployed onto client platforms, the
-# Deploy is also taken into account. For such Projects, the Blamer will try to
-# find, in order:
-#
-# * an open Bug matching the search criteria under any Deploy,
-# * a fixed Bug matching the criteria under the current Deploy, or
-# * a newly-created Bug.
-#
-# In no case will an open Bug in a different Deploy be chosen.
-#
-# Reopening Bugs
-# --------------
-#
-# After linking and saving the Bug returned from {#find_or_create_bug!}, you
-# should call {#reopen_if_necessary!} to potentially reopen the Bug. This should
-# only be done after the Occurrence and Bug are both linked and saved.
-
-class Blamer
-  # The amount of time after a bug is fixed _without_ being deployed after which
-  # it will be reopened if new occurrences appear.
-  STALE_TIMEOUT = 10.days
-
-  attr_reader :occurrence
-
-  # Creates a new instance suitable for placing a given Occurrence.
-  #
-  # @param [Occurrence] occurrence The Occurrence to find a Bug for.
-
-  def initialize(occurrence)
-    @occurrence = occurrence
-    @special    = false
-  end
-
-  # @return [Bug] A Bug the Occurrence should belong to. Does not assign the
-  #   Occurrence to the Bug. If no suitable Bug is found, saves and returns a
-  #   new one.
-
-  def find_or_create_bug!
-    commit = occurrence.commit || deploy.try(:commit)
-    raise "Need a resolvable commit" unless commit
-
-    criteria = bug_search_criteria(commit)
-    bug      = if deploy
-                 # for distributed projects, we need to find either
-                 # * a bug associated with the exact deploy specified in the build attribute
-                 # * or, if the exact deploy specified does not have such a bug:
-                 #   * find any open (not fixed) bug matching the criteria;
-                 #   * if such a bug exists, use that bug and alter its deploy_id to
-                 #     the given deploy;
-                 #   * otherwise, a new bug is created.
-                 b        = Bug.transaction do
-                   environment.bugs.where(criteria.merge(deploy_id: deploy.id)).first ||
-                       environment.bugs.where(criteria.merge(fixed: false)).
-                           find_or_create!(bug_attributes, as: :worker)
-                 end
-                 b.deploy = deploy
-                 b
-               else
-                 # for hosted projects, we search for any bug matching the criteria under
-                 # our current environment
-                 environment.bugs.where(criteria).
-                     find_or_create!(bug_attributes, as: :worker)
-               end
-
-    # If this code works as it should, there should only be one open record of
-    # a Bug at any time. A bug occurs, a new Bug is created. A new release is
-    # out, but it doesn't fix the bug, and that same Bug is reused. A new
-    # release is out that DOES fix the bug, and the bug is closed. The bug
-    # recurs, and a new open Bug is created.
-
-    # Lastly, we need to resolve the bug if it's a duplicate.
-    bug = bug.duplicate_of(true) if bug.duplicate?
-
-    return bug
-  end
-
-  # This method determines if the Bug should be reopened. You should pass in the
-  # Bug returned from {#find_or_create_bug!}, after it has been linked to the
-  # Occurrence and saved.
-  #
-  # This method will reopen the Bug if necessary. The Bug is only reopened if
-  # it recurs after being fixed and after the fix is deployed. A fix is
-  # considered deployed if the fix has been marked `fix_deployed` or if the fix
-  # is over 30 days old.
-  #
-  # Bugs of distributed Projects are never reopened.
-  #
-  # @param [Bug] bug The bug that was returned from {#find_or_create_bug!}.
-
-  def reopen_bug_if_necessary!(bug)
-    return if bug.deploy
-
-    # now that things are saved, reopen the bug if we need to
-    # this is so the occurrence has an id we can write into the reopen event
-    occurrence_deploy = bug.environment.deploys.where(revision: occurrence.revision).order('deployed_at DESC').first
-    latest_deploy     = bug.environment.deploys.order('deployed_at DESC').first
-    if bug.fix_deployed? && occurrence_deploy.try(:id) == latest_deploy.try(:id)
-      # reopen the bug if it was purportedly fixed and deployed, and the occurrence
-      # we're seeing is on the latest deploy -- or if we don't have any deploy
-      # information
-      bug.reopen occurrence
-      bug.save!
-    elsif !bug.fix_deployed? && bug.fixed? && bug.fixed_at < STALE_TIMEOUT.ago
-      # or, if it was fixed but never marked as deployed, and is more than 30 days old, reopen it
-      bug.reopen occurrence
-      bug.save!
-    end
-  end
-
-  private
-
-  def bug() occurrence.bug end
-  def environment() occurrence.bug.environment end
-  def project() occurrence.bug.environment.project end
-  def deploy() occurrence.bug.deploy end
-
-  def bug_search_criteria(occurrence_commit)
-    file, line, commit = blamed_revision(occurrence_commit)
-    {
-        class_name:      occurrence.bug.class_name,
-        file:            file,
-        line:            line,
-        blamed_revision: commit.try(:sha)
-    }
-  end
-
-  def bug_attributes
-    message = if project.disable_message_filtering?
-                occurrence.message
-              else
-                filter_message(occurrence.bug.class_name, occurrence.message)
-              end.truncate(1000)
-
-    {
-        message_template: message,
-        revision:         occurrence.revision,
-        environment:      occurrence.bug.environment,
-        client:           occurrence.client,
-        special_file:     @special
-    }
-  end
-
-  def blamed_revision(occurrence_commit)
-    # first, strip irrelevant lines from the backtrace.
-    backtrace = occurrence.faulted_backtrace.select { |elem| elem['type'].nil? }
-    backtrace.select! { |elem| project.path_type(elem['file']) == :project }
-    backtrace.reject! { |elem| elem['line'].nil? }
-
-    if backtrace.empty? # no project files in the trace; just use the top library file
-      file, line = file_and_line_for_bt_element(occurrence.faulted_backtrace.first)
-      return file, line, nil
-    end
-
-    # collect the blamed commits for each line
-    backtrace.map! do |elem|
-      commit = Blamer::Cache.instance.blame(project, occurrence_commit.sha, elem['file'], elem['line'])
-      [elem, commit]
-    end
-
-    top_element = backtrace.first
-    backtrace.reject! { |(_, commit)| commit.nil? }
-    if backtrace.empty? # no file has an associated commit; just use the top file
-      file, line = file_and_line_for_bt_element(top_element.first)
-      return file, line, nil
-    end
-
-    earliest_commit = backtrace.sort_by { |(_, commit)| commit.committer.date }.first.last
-
-    # now, for each line, assign a score consisting of different weighted factors
-    # indicating how likely it is that that line is to blame
-    backtrace.each_with_index do |line, index|
-      line << score_backtrace_line(index, backtrace.length, line.last.committer.date, occurrence_commit.date, earliest_commit.date)
-    end
-
-    element, commit, _ = backtrace.sort_by(&:last).last
-    file, line = file_and_line_for_bt_element(element)
-    return file, line, commit
-  end
-
-  def file_and_line_for_bt_element(element)
-    case element['type']
-      when nil
-        [element['file'], element['line']]
-      when 'obfuscated'
-        @special = true
-        [element['file'], element['line'].abs]
-      when 'minified'
-        @special = true
-        [element['url'], element['line']]
-      when 'address'
-        @special = true #TODO not the best way of doing this
-        return "0x#{element['address'].to_s(16).rjust(8, '0').upcase}", 1
-      else
-        @special = true
-        return '(unknown)', 1
-    end
-  end
-
-  def score_backtrace_line(index, size, commit_date, latest_date, earliest_date)
-    height  = (size-index)/size.to_f
-    recency = if commit_date && earliest_date
-                if latest_date - earliest_date == 0
-                  0
-                else
-                  1 - (latest_date - commit_date)/(latest_date - earliest_date)
-                end
-              else
-                0
-              end
-
-    0.5*height**2 + 0.5*recency #TODO determine better factors through experimentation
-  end
-
-  def filter_message(class_name, message)
-    template_message = MessageTemplateMatcher.instance.sanitized_message(class_name, message)
-    return template_message if template_message
-
-    message = message.
-        gsub(/#<([^\s]+) (\w+: .+?(, )?)+>/, "#<\\1 [ATTRIBUTES]>") # #<Project id: 1, foo: bar>
-    message.gsub!(/#<([^\s]+) .+?>/, "#<\\1 [DESCRIPTION]>")        # #<Net::HTTP www.apple.com:80 open=true>
-    message.gsub!(/#<(.+?):0x[0-9a-f]+>/, "#<\\1:[ADDRESS]>")       # #<Object:0x007fedfa0aa920>
-    message.gsub!(/\b[0-9a-f]{40}\b/, "[SHA1]")                     # 0e32b153039e46d4165c65eef1fc277d0f8f11d2
-    message.gsub!(/\b\d+\.\d+\.\d+\.\d+\b/, "[IPv4]")               # 144.89.172.115
-    message.gsub!(/\b-?\d+(\.\d+)?\b/, "[NUMBER]")                  # 42.24 or 42 or -42
-    message
-  end
-
-  # A write-through LRU cache of `git-blame` results, backed by the PostgreSQL
-  # `blames` table by means of the {Blame} model.
-
-  class Cache
-    include Singleton
-
-    # The maximum number of cached blame entries to store.
-    MAX_ENTRIES = 500_000
-
-    # Returns the cached result of a blame operation, or performs the blame on a
-    # cache miss. `nil` blame results are never cached.
-    #
-    # @param [Project] project The project whose repository will be used for the
-    #   blame operation.
-    # @param [String] revision The SHA1 revision at which point to run the
-    #   blame.
-    # @param [String] file The file to run the blame on.
-    # @param [Integer] line The line number in the file to run the blame at.
-    # @return [String, nil] The SHA of the blamed revision, or `nil` if blame
-    #   could not be determined for some reason.
-
-    def blame(project, revision, file, line)
-      cached_blame(project, revision, file, line) ||
-          write_blame(project, revision, file, line, git_blame(project, revision, file, line))
-    end
-
-    private
-
-    def cached_blame(project, revision, file, line)
-      blame = Blame.for_project(project).where(revision: revision, file: file, line: line).first
-      if blame
-        blame.touch
-        return project.repo.object(blame.blamed_revision)
-      else
-        return nil
-      end
-    end
-
-    def git_blame(project, revision, file, line)
-      rev = project.repo.blame(file,
-                               revision:               revision,
-                               detect_interfile_moves: true,
-                               detect_intrafile_moves: true,
-                               start:                  line,
-                               end:                    line)[line]
-      rev ? project.repo.object(rev) : nil
-    rescue Git::GitExecuteError
-      Rails.logger.tagged('Blamer') { Rails.logger.error "Couldn't git-blame #{project.slug}:#{revision}: #{$!}" }
-      nil
-    end
-
-    def write_blame(project, revision, file, line, blamed_commit)
-      if blamed_commit
-        purge_entry_if_necessary
-        Blame.for_project(project).
-            where(revision: revision, file: file, line: line).
-            create_or_update! do |blame|
-          blame.blamed_revision = blamed_commit.sha
-        end
-      end
-      return blamed_commit
-    end
-
-    def purge_entry_if_necessary
-      Blame.transaction do
-        if (count = Blame.count) >= MAX_ENTRIES
-          query = Blame.select(:id).order('updated_at ASC').limit((count + 1) - MAX_ENTRIES).to_sql
-          Blame.where("id = ANY(ARRAY(#{query}))").delete_all
-        end
-      end
-    end
-  end
-end
diff --git a/lib/blamer/base.rb b/lib/blamer/base.rb
new file mode 100644
index 00000000..8fe32fdf
--- /dev/null
+++ b/lib/blamer/base.rb
@@ -0,0 +1,223 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Container module for the {Blamer::Base} class cluster.
+
+module Blamer
+
+  # @abstract
+  #
+  # Subclasses of this class analyze an Occurrence and determines which Bug is
+  # responsible. A new Bug is created if no existing Bug matches the search
+  # criteria. Different subclasses implement different strategies for
+  # determining fault.
+  #
+  # Usage
+  # -----
+  #
+  # To re-calculate blame for an existing Occurrence, and potentially re-assign it
+  # to a different Bug, it is sufficient to pass the Occurrence to this class's
+  # initializer.
+  #
+  # To assign blame to a new, unsaved Occurrence, it will be necessary to create
+  # an unsaved Bug and fill it out with the data Blamer needs in order to perform
+  # its search. This data is:
+  #
+  # * the Bug's `environment`,
+  # * the Bug's `class_name`, and
+  # * the Bug's `deploy`, if any.
+  #
+  # This new Bug should be temporarily associated with the Occurrence before the
+  # Occurrence is given to Blamer. The result of the {#find_or_create_bug!} method
+  # will always be a different, saved Bug; you should leave your temporary Bug
+  # unsaved.
+  #
+  # Deployed Projects
+  # -----------------
+  #
+  # For Occurrences that come from Projects deployed onto client platforms, the
+  # Deploy is also taken into account. For such Projects, the Blamer will try to
+  # find, in order:
+  #
+  # * an open Bug matching the search criteria under any Deploy,
+  # * a fixed Bug matching the criteria under the current Deploy, or
+  # * a newly-created Bug.
+  #
+  # In no case will an open Bug in a different Deploy be chosen.
+  #
+  # Reopening Bugs
+  # --------------
+  #
+  # After linking and saving the Bug returned from {#find_or_create_bug!}, you
+  # should call {#reopen_bug_if_necessary!} to potentially reopen the Bug. This
+  # should only be done after the Occurrence and Bug are both linked and saved.
+
+  class Base
+    # The amount of time after a bug is fixed _without_ being deployed after which
+    # it will be reopened if new occurrences appear.
+    STALE_TIMEOUT = 10.days
+
+    # @private
+    attr_reader :occurrence
+
+    # @return [String] A human-readable name for this blamer subclass.
+    def self.human_name()
+      I18n.t("blamer.#{to_s.demodulize.underscore}")
+    end
+
+    # Converts a ref-ish (like "HEAD") into a Git SHA. The default
+    # implementation simply returns the given revision; subclasses can actually
+    # use Git to resolve the SHA.
+    #
+    # @param [Project] project A project whose repository will be used.
+    # @param [String] revision A git ref-ish.
+    # @return [String] The 40-character Git SHA.
+    def self.resolve_revision(project, revision) revision end
+
+    # Creates a new instance suitable for placing a given Occurrence.
+    #
+    # @param [Occurrence] occurrence The Occurrence to find a Bug for.
+
+    def initialize(occurrence)
+      @occurrence = occurrence
+      @special    = false
+    end
+
+    # @return [Bug] A Bug the Occurrence should belong to. Does not assign the
+    #   Occurrence to the Bug. If no suitable Bug is found, saves and returns a
+    #   new one.
+
+    def find_or_create_bug!
+      criteria = bug_search_criteria
+      bug      = if deploy
+                   # for distributed projects, we need to find either
+                   # * a bug associated with the exact deploy specified in the build attribute
+                   # * or, if the exact deploy specified does not have such a bug:
+                   #   * find any open (not fixed) bug matching the criteria;
+                   #   * if such a bug exists, use that bug and alter its deploy_id to
+                   #     the given deploy;
+                   #   * otherwise, a new bug is created.
+                   b        = Bug.transaction do
+                     environment.bugs.where(criteria.merge(deploy_id: deploy.id)).first ||
+                         environment.bugs.where(criteria.merge(fixed: false)).
+                             find_or_create!(bug_attributes)
+                   end
+                   b.deploy = deploy
+                   b
+                 else
+                   # for hosted projects, we search for any bug matching the criteria under
+                   # our current environment
+                   environment.bugs.where(criteria).
+                       find_or_create!(bug_attributes)
+                 end
+
+      # If this code works as it should, there should only be one open record of
+      # a Bug at any time. A bug occurs, a new Bug is created. A new release is
+      # out, but it doesn't fix the bug, and that same Bug is reused. A new
+      # release is out that DOES fix the bug, and the bug is closed. The bug
+      # recurs, and a new open Bug is created.
+
+      # Lastly, we need to resolve the bug if it's a duplicate.
+      bug      = bug.duplicate_of(true) if bug.duplicate?
+
+      return bug
+    end
+
+    # This method determines if the Bug should be reopened. You should pass in the
+    # Bug returned from {#find_or_create_bug!}, after it has been linked to the
+    # Occurrence and saved.
+    #
+    # This method will reopen the Bug if necessary. The Bug is only reopened if
+    # it recurs after being fixed and after the fix is deployed. A fix is
+    # considered deployed if the fix has been marked `fix_deployed` or if the fix
+    # is over 30 days old.
+    #
+    # Bugs of distributed Projects are never reopened.
+    #
+    # @param [Bug] bug The bug that was returned from {#find_or_create_bug!}.
+
+    def reopen_bug_if_necessary!(bug)
+      return if bug.deploy
+
+      # now that things are saved, reopen the bug if we need to
+      # this is so the occurrence has an id we can write into the reopen event
+      occurrence_deploy = bug.environment.deploys.where(revision: occurrence.revision).order('deployed_at DESC').first
+      latest_deploy     = bug.environment.deploys.order('deployed_at DESC').first
+      if bug.fix_deployed? && occurrence_deploy.try!(:id) == latest_deploy.try!(:id)
+        # reopen the bug if it was purportedly fixed and deployed, and the occurrence
+        # we're seeing is on the latest deploy -- or if we don't have any deploy
+        # information
+        bug.reopen occurrence
+        bug.save!
+      elsif !bug.fix_deployed? && bug.fixed? && bug.fixed_at < STALE_TIMEOUT.ago
+        # or, if it was fixed but never marked as deployed, and is more than 30 days old, reopen it
+        bug.reopen occurrence
+        bug.save!
+      end
+    end
+
+    protected
+
+    # @abstract
+    #
+    # @return [Hash<Symbol, Object>] A hash of search criteria to be used in a
+    #   `WHERE` clause to locate a Bug to file an Occurrence under.
+
+    def bug_search_criteria
+      raise NotImplementedError
+    end
+
+    private
+
+    def bug() occurrence.bug end
+    def environment() occurrence.bug.environment end
+    def project() occurrence.bug.environment.project end
+    def deploy() occurrence.bug.deploy end
+
+    def bug_attributes
+      message = if project.disable_message_filtering?
+                  occurrence.message
+                else
+                  filter_message(occurrence.bug.class_name, occurrence.message)
+                end.truncate(1000)
+
+      {
+          message_template: message,
+          revision:         occurrence.revision,
+          environment:      occurrence.bug.environment,
+          client:           occurrence.client,
+          special_file:     @special
+      }
+    end
+
+    def filter_message(class_name, message)
+      template_message = MessageTemplateMatcher.instance.sanitized_message(class_name, message)
+      return template_message if template_message
+
+      message = message.
+          gsub(/#<([^\s]+) (\w+: .+?(, )?)+>/, "#<\\1 [ATTRIBUTES]>") # #<Project id: 1, foo: bar>
+      message.gsub!(/#<([^\s]+) .+?>/, "#<\\1 [DESCRIPTION]>") # #<Net::HTTP www.apple.com:80 open=true>
+      message.gsub!(/#<(.+?):0x[0-9a-f]+>/, "#<\\1:[ADDRESS]>") # #<Object:0x007fedfa0aa920>
+      message.gsub!(/\b[0-9a-f]{40}\b/, "[SHA1]") # 0e32b153039e46d4165c65eef1fc277d0f8f11d2
+      message.gsub!(/\b\d+\.\d+\.\d+\.\d+\b/, "[IPv4]") # 144.89.172.115
+      message.gsub!(/\b-?\d+(\.\d+)?\b/, "[NUMBER]") # 42.24 or 42 or -42
+      message
+    end
+  end
+end
+
+Dir.glob(Rails.root.join('lib', 'blamer', '*.rb')).each do |file|
+  next if file == __FILE__
+  require file
+end
diff --git a/lib/blamer/cache.rb b/lib/blamer/cache.rb
new file mode 100644
index 00000000..54ed27b0
--- /dev/null
+++ b/lib/blamer/cache.rb
@@ -0,0 +1,89 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+module Blamer
+
+  # A write-through LRU cache of `git-blame` results, backed by the PostgreSQL
+  # `blames` table by means of the {Blame} model.
+
+  class Cache
+    include Singleton
+
+    # The maximum number of cached blame entries to store.
+    MAX_ENTRIES = 500_000
+
+    # Returns the cached result of a blame operation, or performs the blame on a
+    # cache miss. `nil` blame results are never cached.
+    #
+    # @param [Project] project The project whose repository will be used for the
+    #   blame operation.
+    # @param [String] revision The SHA1 revision at which point to run the
+    #   blame.
+    # @param [String] file The file to run the blame on.
+    # @param [Integer] line The line number in the file to run the blame at.
+    # @return [String, nil] The SHA of the blamed revision, or `nil` if blame
+    #   could not be determined for some reason.
+
+    def blame(project, revision, file, line)
+      cached_blame(project, revision, file, line) ||
+          write_blame(project, revision, file, line, git_blame(project, revision, file, line))
+    end
+
+    private
+
+    def cached_blame(project, revision, file, line)
+      blame = Blame.for_project(project).where(revision: revision, file: file, line: line).first
+      if blame
+        blame.touch
+        return project.repo.object(blame.blamed_revision)
+      else
+        return nil
+      end
+    end
+
+    def git_blame(project, revision, file, line)
+      rev = project.repo.blame(file,
+                               revision:               revision,
+                               detect_interfile_moves: true,
+                               detect_intrafile_moves: true,
+                               start:                  line,
+                               end:                    line)[line]
+      rev ? project.repo.object(rev) : nil
+    rescue Git::GitExecuteError
+      Rails.logger.tagged('Blamer') { Rails.logger.error "Couldn't git-blame #{project.slug}:#{revision}: #{$!}" }
+      nil
+    end
+
+    def write_blame(project, revision, file, line, blamed_commit)
+      if blamed_commit
+        purge_entry_if_necessary
+        Blame.for_project(project).
+            where(revision: revision, file: file, line: line).
+            create_or_update! do |blame|
+          blame.blamed_revision = blamed_commit.sha
+        end
+      end
+      return blamed_commit
+    end
+
+    def purge_entry_if_necessary
+      Blame.transaction do
+        if (count = Blame.count) >= MAX_ENTRIES
+          query = Blame.select(:id).order('updated_at ASC').limit((count + 1) - MAX_ENTRIES).to_sql
+          Blame.where("id = ANY(ARRAY(#{query}))").delete_all
+        end
+      end
+    end
+  end
+end
diff --git a/lib/blamer/recency.rb b/lib/blamer/recency.rb
new file mode 100644
index 00000000..23a211f9
--- /dev/null
+++ b/lib/blamer/recency.rb
@@ -0,0 +1,158 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+module Blamer
+
+  # This blamer uses the recency of the commit that most recently modified a
+  # given stack trace element to determine how likely that line is to be at
+  # fault.
+  #
+  # Matching to a Bug
+  # -----------------
+  #
+  # In order to match an Occurrence to a Bug, the line number of the backtrace
+  # that is at fault must first be determined. This is done probabilistically, by
+  # assigning a score to each line of the backtrace and picking the line with
+  # the highest score. Currently, the factors that influence a line's score are
+  #
+  # * the "height" of that line in the backtrace, and
+  # * the age of the commit that most recently modified that line.
+  #
+  # The highest-scoring file and line number are termed the **relevant file** and
+  # **relevant line**.
+  #
+  # An Occurrence is matched to a Bug using three mandatory criteria:
+  #
+  # * the relevant file path,
+  # * the relevant line number, and
+  # * the class name of the raised exception.
+  #
+  # In addition, if a "blamed" commit is available for the relevant file and line,
+  # the bug is matched on that commit ID as well. Note that the exception message
+  # is _not_ included in the search criteria.
+  #
+  # While each Occurrence maintains the original exception message, the Bug
+  # filters the exception message to remove occurrence-specific information. There
+  # are two ways of filtering exception messages:
+  #
+  # * If the exception can be filtered using {MessageTemplateMatcher}, that
+  #   filtered message is used.
+  # * Otherwise, a general search-and-replace is used to replace likely
+  #   occurrence-specific information (like numbers, inspect values, etc.) with
+  #   placeholders.
+  #
+  # All placeholders take the form "[ALL CAPS IN BRACKETS]" so that the view can
+  # recognize them as such and format them appropriately.
+
+  class Recency < Base
+
+    def self.resolve_revision(project, revision)
+      commit   = project.repo.object(revision)
+      if commit.nil?
+        project.repo(&:fetch)
+        commit = project.repo.object(revision)
+      end
+      raise "Unknown revision" unless commit
+      commit.sha
+    end
+
+    protected
+
+    def bug_search_criteria
+      commit = occurrence.commit || deploy.try!(:commit)
+      raise "Need a resolvable commit" unless commit
+
+      file, line, commit = blamed_revision(commit)
+      {
+          class_name:      occurrence.bug.class_name,
+          file:            file,
+          line:            line,
+          blamed_revision: commit.try!(:sha)
+      }
+    end
+
+    private
+
+    def blamed_revision(occurrence_commit)
+      # first, strip irrelevant lines from the backtrace.
+      backtrace = occurrence.faulted_backtrace.select { |elem| elem['type'].nil? }
+      backtrace.select! { |elem| project.path_type(elem['file']) == :project }
+      backtrace.reject! { |elem| elem['line'].nil? }
+
+      if backtrace.empty? # no project files in the trace; just use the top library file
+        file, line = file_and_line_for_bt_element(occurrence.faulted_backtrace.first)
+        return file, line, nil
+      end
+
+      # collect the blamed commits for each line
+      backtrace.map! do |elem|
+        commit = Blamer::Cache.instance.blame(project, occurrence_commit.sha, elem['file'], elem['line'])
+        [elem, commit]
+      end
+
+      top_element = backtrace.first
+      backtrace.reject! { |(_, commit)| commit.nil? }
+      if backtrace.empty? # no file has an associated commit; just use the top file
+        file, line = file_and_line_for_bt_element(top_element.first)
+        return file, line, nil
+      end
+
+      earliest_commit = backtrace.sort_by { |(_, commit)| commit.committer.date }.first.last
+
+      # now, for each line, assign a score consisting of different weighted factors
+      # indicating how likely it is that that line is to blame
+      backtrace.each_with_index do |line, index|
+        line << score_backtrace_line(index, backtrace.length, line.last.committer.date, occurrence_commit.date, earliest_commit.date)
+      end
+
+      element, commit, _ = backtrace.sort_by(&:last).last
+      file, line         = file_and_line_for_bt_element(element)
+      return file, line, commit
+    end
+
+    def file_and_line_for_bt_element(element)
+      case element['type']
+        when nil
+          [element['file'], element['line']]
+        when 'obfuscated'
+          @special = true
+          [element['file'], element['line'].abs]
+        when 'js:hosted'
+          @special = true
+          [element['url'], element['line']]
+        when 'address'
+          @special = true #TODO not the best way of doing this
+          return "0x#{element['address'].to_s(16).rjust(8, '0').upcase}", 1
+        else
+          @special = true
+          return '(unknown)', 1
+      end
+    end
+
+    def score_backtrace_line(index, size, commit_date, latest_date, earliest_date)
+      height  = (size-index)/size.to_f
+      recency = if commit_date && earliest_date
+                  if latest_date - earliest_date == 0
+                    0
+                  else
+                    1 - (latest_date - commit_date)/(latest_date - earliest_date)
+                  end
+                else
+                  0
+                end
+
+      0.5*height**2 + 0.5*recency #TODO determine better factors through experimentation
+    end
+  end
+end
diff --git a/lib/blamer/simple.rb b/lib/blamer/simple.rb
new file mode 100644
index 00000000..fc989de0
--- /dev/null
+++ b/lib/blamer/simple.rb
@@ -0,0 +1,39 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'digest/sha2'
+
+module Blamer
+
+  # A simple, Git-free blamer that groups occurrences with identical stack
+  # traces. While less cool than the {Blamer::Recency Recency} blamer, it has
+  # the advantage of not requiring access to the Git repository.
+
+  class Simple < Base
+
+    protected
+
+    def bug_search_criteria
+      @special = true
+      file     = '[S] ' + Digest::SHA2.hexdigest(occurrence.faulted_backtrace.to_json)
+
+      {
+          class_name:      occurrence.bug.class_name,
+          file:            file,
+          line:            1,
+          blamed_revision: nil
+      }
+    end
+  end
+end
diff --git a/lib/file_mutex.rb b/lib/file_mutex.rb
index a36691f0..bb512816 100644
--- a/lib/file_mutex.rb
+++ b/lib/file_mutex.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,17 +12,17 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'fileutils'
+require 'socket'
+
 # A mutex that uses a lockfile to synchronize on. The presence of the lockfile
-# does not necessarily indicate that the resource is in use; synchronization is
-# done using flock, so the presence of an advisory lock is the only indicator
-# that the resource is in use.
-#
-# The {#lock} method is for creating _shared_ locks; the {#lock!} method for
-# creating _exclusive_ locks. Multiple threads/processes can open shared locks
-# on a resource simultaneously, but the presence of one exclusive lock denies
-# access to any other locks.
+# indicates that the resource is in use; the contents of the file identify the
+# owner of the lock.
 
 class FileMutex
+  # The default timeout to wait for an exclusive lock before raising
+  # `Timeout::Error`.
+  DEFAULT_TIMEOUT = 60.minutes
 
   # Creates a new file-based mutex.
   #
@@ -33,58 +33,46 @@ def initialize(path)
     @path = path
   end
 
-  # @overload lock
-  #   Attempts to acquire a shared lock on the resource. Returns `false` if
-  #   the lock could not be acquired, `true` if it can. Returning `true` at one
-  #   instant is not a guarantee that the lock will be available at the next
-  #   instant.
-  #   @return [true, false] Whether a shared lock is currently available.
-  # @overload lock
-  #   Attempts to acquire a shared lock on the resource. Blocks until a lock is
-  #   available. Once a lock is available, acquires it, executes the provided
-  #   block, and then releases the lock.
-  #   @yield The code to run in the lock.
-  #   @return The result of the block.
+  # Attempts to acquire an exclusive lock on the resource. Blocks until a lock
+  # is available. Once a lock is available, acquires it, executes the provided
+  # block, and then releases the lock.
+  #
+  # @yield The code to run in the lock.
+  # @return The result of the block.
 
-  def lock
+  def lock!(timeout_duration = DEFAULT_TIMEOUT)
     result = nil
-    File.open(@path, File::RDONLY|File::CREAT) do |f|
-      if block_given?
-        f.flock File::LOCK_SH
-        result = yield
-      else
-        return f.flock File::LOCK_SH|File::LOCK_NB
+
+    File.open(@path, File::CREAT|File::EXCL|File::WRONLY, 0644) do |f|
+      f.puts contents
+      f.flush
+      Timeout.timeout(timeout_duration) do
+        begin
+          result = yield
+        ensure
+          unlock!
+        end
       end
     end
     return result
+  rescue Errno::EEXIST
+    sleep 1
+    retry
+  ensure
+    unlock!
   end
-  alias with_shared_lock lock
+  alias synchronize lock!
 
-  # @overload lock!
-  #   Attempts to acquire an exclusive lock on the resource. Returns `false` if
-  #   the lock could not be acquired, `true` if it can. Returning `true` at one
-  #   instant is not a guarantee that the lock will be available at the next
-  #   instant.
-  #   @return [true, false] Whether an exclusive lock is currently available.
-  # @overload lock!
-  #   Attempts to acquire an exclusive lock on the resource. Blocks until a lock
-  #   is available. Once a lock is available, acquires it, executes the provided
-  #   block, and then releases the lock.
-  #   @yield The code to run in the lock.
-  #   @return The result of the block.
+  # Forces this lock to be unlocked. Does nothing if the lock is already
+  # unlocked.
 
-  def lock!
-    result = nil
-    File.open(@path, File::RDWR|File::CREAT, 0644) do |f|
-      if block_given?
-        f.flock File::LOCK_EX
-        result = yield
-      else
-        return f.flock File::LOCK_EX|File::LOCK_NB
-      end
-    end
-    return result
+  def unlock!
+    FileUtils.rm_f @path
+  end
+
+  private
+
+  def contents
+    "created=#{Time.now.to_s}, pid=#{Process.pid}, thread=#{Thread.current.object_id}\n\n" + caller.join("\n")
   end
-  alias synchronize lock!
-  alias with_exclusive_lock lock!
 end
diff --git a/lib/known_revision_validator.rb b/lib/known_revision_validator.rb
index 356e03e5..c324aed2 100644
--- a/lib/known_revision_validator.rb
+++ b/lib/known_revision_validator.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/message_template_matcher.rb b/lib/message_template_matcher.rb
index 38f9720a..52cfb361 100644
--- a/lib/message_template_matcher.rb
+++ b/lib/message_template_matcher.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/multithread.rb b/lib/multithread.rb
index 1f9fc994..1489545a 100644
--- a/lib/multithread.rb
+++ b/lib/multithread.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -137,7 +137,7 @@ def enq(name, priority=50, &block)
         push Job.new(block, -1, name)
         escalate size - 1, priority
         begin
-          @waiting.shift.try(:wakeup)
+          @waiting.shift.try!(:wakeup)
         rescue ThreadError
           retry
         end
diff --git a/lib/repo_proxy.rb b/lib/repo_proxy.rb
index 5c78b80a..a23553d2 100644
--- a/lib/repo_proxy.rb
+++ b/lib/repo_proxy.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/service.rb b/lib/service.rb
index 4f64594c..b07e4844 100644
--- a/lib/service.rb
+++ b/lib/service.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/service/jira.rb b/lib/service/jira.rb
index b86b13f6..1c82f506 100644
--- a/lib/service/jira.rb
+++ b/lib/service/jira.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -55,9 +55,13 @@ def new_issue_link(properties)
     # @return [JIRA::Resource::Issue, nil] The issue with that key, if found.
 
     def issue(key)
-      client.Issue.find(key)
-    rescue ::JIRA::HTTPError
-      nil
+      return nil if Squash::Configuration.jira.disabled?
+
+      begin
+        client.Issue.find(key)
+      rescue ::JIRA::HTTPError
+        nil
+      end
     end
 
     # @return [Array<JIRA::Resource::Status>] All known JIRA issue statuses.
diff --git a/lib/service/pager_duty.rb b/lib/service/pager_duty.rb
index 204a7dba..8aaf352c 100644
--- a/lib/service/pager_duty.rb
+++ b/lib/service/pager_duty.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/sidekiq_auth_constraint.rb b/lib/sidekiq_auth_constraint.rb
new file mode 100644
index 00000000..e4ca0d82
--- /dev/null
+++ b/lib/sidekiq_auth_constraint.rb
@@ -0,0 +1,47 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Authorization constraint, used by the Sidekiq routes, that ensures that there
+# exists a current user session.
+
+module SidekiqAuthConstraint
+
+  # The default `authorized?` implementation if there is no refined
+  # implementation provided by the authentication strategy.
+
+  module Default
+    
+    # Determines whether a user can access the Sidekiq admin page.
+    #
+    # @param [ActionDispatch::Request] request A request.
+    # @return [true, false] Whether the user can access the Sidekiq admin page.
+
+    def authorized?(request)
+      return false unless request.session[:user_id]
+      user = User.find(request.session[:user_id])
+      !user.nil?
+    end
+  end
+
+  # first incorporate the default behavior
+  extend Default
+
+  # then, if available, incorporate the auth-specific behavior
+  begin
+    auth_module = "sidekiq_auth_constraint/#{Squash::Configuration.authentication.strategy}".camelize.constantize
+    extend auth_module
+  rescue NameError
+    # no auth module; ignore
+  end
+end
diff --git a/lib/tasks/concurrency.rake b/lib/tasks/concurrency.rake
new file mode 100644
index 00000000..ea690ea1
--- /dev/null
+++ b/lib/tasks/concurrency.rake
@@ -0,0 +1,21 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'configoro'
+Configoro.initialize
+
+filename = Squash::Configuration.concurrency.background_runner.underscore + '.rake'
+file     = Rails.root.join('lib', 'background_runner', 'tasks', filename)
+
+load(file) if File.exist?(file)
diff --git a/lib/tasks/doc.rake b/lib/tasks/doc.rake
index bb0ee46f..ee31438b 100644
--- a/lib/tasks/doc.rake
+++ b/lib/tasks/doc.rake
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -25,15 +25,10 @@ if Rails.env.development?
   YARD::Rake::YardocTask.new do |doc|
     doc.options << '-m' << 'markdown' << '-M' << 'redcarpet'
     doc.options << '--protected' << '--no-private'
-    doc.options << '-r' << 'doc/README_FOR_APP.md'
+    doc.options << '-r' << 'README.md'
     doc.options << '-o' << 'doc/app'
     doc.options << '--title' << "Squash Documentation"
 
     doc.files = %w( app/**/*.rb lib/**/*.rb - doc/*.md )
   end
 end
-
-desc "Generate fdoc documentation to doc/fdoc-html"
-task :fdoc do
-  system 'fdoc_to_html', 'doc/fdoc', 'doc/fdoc-html'
-end
diff --git a/lib/tasks/jira.rake b/lib/tasks/jira.rake
index 61467dd3..6e324e1f 100644
--- a/lib/tasks/jira.rake
+++ b/lib/tasks/jira.rake
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
index 7ea7419b..5b45d19e 100644
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/tasks/statistics.rake b/lib/tasks/statistics.rake
index 10e2dd2a..d227793d 100644
--- a/lib/tasks/statistics.rake
+++ b/lib/tasks/statistics.rake
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/tasks/truncation.rake b/lib/tasks/truncation.rake
index 1bcc5a7b..d3de2fa2 100644
--- a/lib/tasks/truncation.rake
+++ b/lib/tasks/truncation.rake
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/workers/comment_notification_mailer.rb b/lib/workers/comment_notification_mailer.rb
index d308c9fe..6256e481 100644
--- a/lib/workers/comment_notification_mailer.rb
+++ b/lib/workers/comment_notification_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # {Comment} on a {Bug}.
 
 class CommentNotificationMailer
+  include BackgroundRunner::Job
 
   # Creates a new instance and sends notification emails.
   #
@@ -41,6 +42,6 @@ def perform
     recipients.delete @comment.user_id
     recipients.uniq!
 
-    User.where(id: recipients).each { |user| NotificationMailer.deliver :comment, @comment, user }
+    User.where(id: recipients).each { |user| NotificationMailer.comment(@comment, user).deliver_now }
   end
 end
diff --git a/lib/workers/deploy_fix_marker.rb b/lib/workers/deploy_fix_marker.rb
index cb60a878..876e1e44 100644
--- a/lib/workers/deploy_fix_marker.rb
+++ b/lib/workers/deploy_fix_marker.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 # large history.
 
 class DeployFixMarker
+  include BackgroundRunner::Job
+
   # The number of commits to load per page.
   COMMIT_PAGE_SIZE = 50
 
diff --git a/lib/workers/deploy_notification_mailer.rb b/lib/workers/deploy_notification_mailer.rb
index 09babe32..dab843ed 100644
--- a/lib/workers/deploy_notification_mailer.rb
+++ b/lib/workers/deploy_notification_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # of a new Deploy.
 
 class DeployNotificationMailer
+  include BackgroundRunner::Job
 
   # Creates a new instance and sends notification emails.
   #
@@ -37,7 +38,7 @@ def initialize(bug)
 
   def perform
     User.where(id: @bug.notify_on_deploy).each do |user|
-      NotificationMailer.deliver :deploy, @bug, user
+      NotificationMailer.deploy(@bug, user).deliver_now
     end
   end
 end
diff --git a/lib/workers/jira_status_updater.rb b/lib/workers/jira_status_worker.rb
similarity index 96%
rename from lib/workers/jira_status_updater.rb
rename to lib/workers/jira_status_worker.rb
index 591fb468..3f15ee32 100644
--- a/lib/workers/jira_status_updater.rb
+++ b/lib/workers/jira_status_worker.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 # task, or otherwise periodically, to fully support JIRA integration.
 
 class JiraStatusWorker
+  include BackgroundRunner::Job
 
   # Creates a new instance and updates bug statuses.
 
diff --git a/lib/workers/obfuscation_map_creator.rb b/lib/workers/obfuscation_map_creator.rb
new file mode 100644
index 00000000..feac861e
--- /dev/null
+++ b/lib/workers/obfuscation_map_creator.rb
@@ -0,0 +1,50 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Worker that decodes an obfuscation map from parameters given to the API
+# controller, and creates the {ObfuscationMap} object.
+
+class ObfuscationMapCreator
+  include BackgroundRunner::Job
+
+  # Creates a new instance and creates the ObfuscationMap.
+  #
+  # @param [Hash] params Parameters passed to the API controller.
+
+  def self.perform(params)
+    new(params).perform
+  end
+
+  # Creates a new instance with the given parameters.
+  #
+  # @param [Hash] params Parameters passed to the API controller.
+
+  def initialize(params)
+    @params = params
+  end
+
+  # Decodes parameters and creates the ObfuscationMap.
+
+  def perform
+    map = YAML.load(Zlib::Inflate.inflate(Base64.decode64(@params['namespace'])), safe: true, deserialize_symbols: false)
+    return unless map.kind_of?(Squash::Java::Namespace)
+
+    project = Project.find_by_api_key(@params['api_key']) or raise(API::UnknownAPIKeyError)
+    deploy = project.
+        environments.with_name(@params['environment']).first!.
+        deploys.find_by_build!(@params['build'])
+    deploy.obfuscation_map.try! :destroy
+    deploy.create_obfuscation_map!(namespace: map)
+  end
+end
diff --git a/lib/workers/obfuscation_map_worker.rb b/lib/workers/obfuscation_map_worker.rb
index 71f5076a..f8c94e34 100644
--- a/lib/workers/obfuscation_map_worker.rb
+++ b/lib/workers/obfuscation_map_worker.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # ObfuscationMap, and attempts to deobfuscate them using the new map.
 
 class ObfuscationMapWorker
+  include BackgroundRunner::Job
 
   # Creates a new worker instance and performs a deobfuscation.
   #
diff --git a/lib/workers/occurrence_notification_mailer.rb b/lib/workers/occurrence_notification_mailer.rb
index 7f8a45f2..14146ba4 100644
--- a/lib/workers/occurrence_notification_mailer.rb
+++ b/lib/workers/occurrence_notification_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,14 +15,15 @@
 # Simple worker class that sends the following emails when appropriate:
 #
 # * everyone on a {Bug}'s `notify_on_occurrence` list,
-# * frequency-based email notifications when frequency thresholds are tripped,
-#   and
+# * frequency-based email and PagerDurity notifications when frequency
+#   thresholds are tripped, and
 # * the project-wide critical email if the critical threshold was breached.
 #
 # See {NotificationThreshold} for more information on frequency-based
 # notification.
 
 class OccurrenceNotificationMailer
+  include BackgroundRunner::Job
 
   # Creates a new instance and sends notification emails.
   #
@@ -44,18 +45,19 @@ def initialize(occurrence)
   # frequency-based notifications as appropriate.
 
   def perform
-    if @occurrence.bug.occurrences_count == @occurrence.bug.environment.project.critical_threshold
-      NotificationMailer.deliver :critical, @occurrence.bug
+    if @occurrence.bug.occurrences_count == @occurrence.bug.environment.project.critical_threshold &&
+        !@occurrence.bug.fixed? && !@occurrence.bug.irrelevant?
+      NotificationMailer.critical(@occurrence.bug).deliver_now
     end
 
     User.where(id: @occurrence.bug.notify_on_occurrence).each do |user|
-      NotificationMailer.deliver :occurrence, @occurrence, user
+      NotificationMailer.occurrence(@occurrence, user).deliver_now
     end
 
     @occurrence.bug.notification_thresholds.cursor.each do |thresh|
       begin
         if thresh.tripped?
-          NotificationMailer.deliver :threshold, @occurrence.bug, thresh.user
+          NotificationMailer.threshold(@occurrence.bug, thresh.user).deliver_now
           thresh.touch :last_tripped_at
         end
       rescue => err
diff --git a/lib/workers/occurrences_worker.rb b/lib/workers/occurrences_worker.rb
index cba2859c..3ed304b0 100644
--- a/lib/workers/occurrences_worker.rb
+++ b/lib/workers/occurrences_worker.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -30,6 +30,8 @@
 # When the Occurrence is created, it is assigned to a Bug by the {Blamer} class.
 
 class OccurrencesWorker
+  include BackgroundRunner::Job
+
   # Keys that must be passed to the {.perform} method. (We also need either the
   # `build` or `revision` keys.)
   REQUIRED_KEYS = %w( api_key environment client backtraces class_name message occurred_at )
@@ -37,7 +39,7 @@ class OccurrencesWorker
   # @private
   attr_reader :project, :environment, :deploy
 
-  # Included for Resque compatibility.
+  # Included for BackgroundRunner compatibility.
 
   def self.perform(attrs)
     new(attrs).perform
@@ -62,7 +64,7 @@ def initialize(attrs)
     end
 
     env_name     = @attrs.delete('environment')
-    @environment = project.environments.with_name(env_name).find_or_create!({name: env_name}, as: :worker)
+    @environment = project.environments.with_name(env_name).find_or_create!(name: env_name)
   rescue ActiveRecord::RecordInvalid => err
     raise API::InvalidAttributesError, err.to_s
   end
@@ -72,9 +74,9 @@ def initialize(attrs)
 
   def perform
     # First make an occurrence to perform a blame on
-    commit     = set_deploy_and_commit
-    class_name = @attrs.delete('class_name')
-    occurrence = build_occurrence(commit)
+    commit         = set_deploy_and_commit
+    class_name     = @attrs.delete('class_name')
+    occurrence     = build_occurrence(commit)
 
     # In order to use Blamer, we need to create a new, unsaved bug with the
     # class name and environment specified in @attrs. If blamer finds a matching
@@ -82,19 +84,21 @@ def perform
     # saved. If however no matching bug is found, a new bug is created, saved,
     # and returned. In no case is the bug we create below saved.
     occurrence.bug = build_temporary_bug(class_name)
-    blamer         = Blamer.new(occurrence)
+    blamer         = project.blamer.new(occurrence)
     bug            = blamer.find_or_create_bug!
 
     # these must be done after Blamer runs
     add_user_agent_data occurrence
-    occurrence.message = pii_filter(MessageTemplateMatcher.instance.matched_substring(class_name, occurrence.message)) unless project.disable_message_filtering?
+    filter_pii(occurrence, class_name) unless project.disable_message_filtering?
     occurrence.message = occurrence.message.truncate(1000)
     occurrence.message ||= occurrence.class_name # hack for Java
-    
+
     # hook things up and save
     occurrence.bug     = bug
-    bug.save!
-    occurrence.save!
+    Bug.transaction do
+      bug.save!
+      occurrence.save!
+    end
 
     blamer.reopen_bug_if_necessary! bug
     occurrence
@@ -131,7 +135,7 @@ def build_temporary_bug(class_name)
     return bug
   end
 
-  def build_occurrence(commit)
+  def build_occurrence(sha)
     # extract top-level attributes and metadata; stick the rest in user_data
 
     occurrence_attrs = Hash.new
@@ -143,13 +147,23 @@ def build_occurrence(commit)
         other_data[k] = v
       end
     end
-    occurrence_attrs['query'] = occurrence_attrs['query'][0, 255] if occurrence_attrs['query']
-    occurrence_attrs['revision'] = commit.sha
+    occurrence_attrs['query']    = occurrence_attrs['query'][0, 255] if occurrence_attrs['query']
+    occurrence_attrs['revision'] = sha
 
     occurrence          = Occurrence.new(occurrence_attrs)
     occurrence.metadata = JSON.parse(occurrence.metadata).reverse_merge(other_data).to_json
     occurrence.message  ||= occurrence.class_name # hack for Java
-    occurrence.symbolicate                        # must symbolicate before assigning blame
+
+    # must symbolicate before assigning blame
+
+    occurrence.symbolicate
+
+    sourcemaps = environment.source_maps.where(revision: sha)
+    occurrence.sourcemap(*sourcemaps) unless sourcemaps.empty?
+
+    obfuscation_map = ObfuscationMap.joins(:deploy).where(deploys: {environment_id: environment.id, revision: sha}).first
+    occurrence.deobfuscate(obfuscation_map) if obfuscation_map
+
     occurrence
   end
 
@@ -162,27 +176,17 @@ def set_deploy_and_commit
       # create one if it doesn't exist, and use that.
 
       revision = @attrs['revision']
-      commit   = project.repo.object(revision)
-      if commit.nil?
-        project.repo(&:fetch)
-        commit = project.repo.object(revision)
-      end
-      raise "Unknown revision" unless commit
-
-      @deploy = @environment.deploys.where(build: @attrs['build']).find_or_create!(
-          {deployed_at: Time.now, revision: commit.sha}, as: :worker
+      sha      = project.blamer.resolve_revision(project, revision)
+      @deploy  = @environment.deploys.where(build: @attrs['build']).find_or_create!(
+          deployed_at: Time.now,
+          revision:    sha
       )
     elsif @attrs['revision'].present?
       # If we get only a revision, the Bug won't have a Deploy, but we still
       # have a revision to do blaming with.
 
       revision = @attrs['revision']
-      commit   = project.repo.object(revision)
-      if commit.nil?
-        project.repo(&:fetch)
-        commit = project.repo.object(revision)
-      end
-      raise "Unknown revision" unless commit
+      sha      = project.blamer.resolve_revision(project, revision)
     elsif @attrs['build'].present?
       # If we get only a build, we can find the Deploy with that build number
       # and use it to get the revision.
@@ -190,14 +194,13 @@ def set_deploy_and_commit
       begin
         @deploy = environment.deploys.find_by_build(@attrs['build'])
         raise API::InvalidAttributesError, "Unknown build number" unless deploy
-        commit = deploy.commit
-        raise "Unknown revision" unless commit
+        sha = deploy.revision
       end
     else
       # If we get nothing, we can't do anything.
       raise API::InvalidAttributesError, "Missing required keys"
     end
-    commit
+    sha
   end
 
   def add_user_agent_data(occurrence)
@@ -217,7 +220,37 @@ def add_user_agent_data(occurrence)
     occurrence.browser_engine_version = ua.engine_version
   end
 
-  def pii_filter(str)
+  def filter_pii(occurrence, class_name)
+    occurrence.message = filter_pii_string(MessageTemplateMatcher.instance.matched_substring(class_name, occurrence.message))
+
+    occurrence.query    = filter_pii_string(occurrence.query) if occurrence.query
+    occurrence.path     = filter_pii_string(occurrence.path) if occurrence.path
+    occurrence.fragment = filter_pii_string(occurrence.fragment) if occurrence.fragment
+
+    occurrence.parent_exceptions.each do |parent|
+      parent['message'] = filter_pii_string(MessageTemplateMatcher.instance.matched_substring(parent['class_name'], parent['message']))
+      parent['ivars'].each { |name, param| parent['ivars'][name] = filter_pii_param(param) }
+    end if occurrence.parent_exceptions
+    %w(session headers flash params cookies ivars).each do |field|
+      occurrence.send(field).each do |name, value|
+        occurrence.send(field)[name] = filter_pii_param(value)
+      end if occurrence.send(field)
+    end
+  end
+
+  def filter_pii_param(param)
+    case param
+      when String
+        filter_pii_string param
+      when Hash
+        param.each do |representation, value|
+          next if %w(language class_name).include?(representation)
+          param[representation] = filter_pii_string(value)
+        end
+    end
+  end
+
+  def filter_pii_string(str)
     str.gsub(/\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b/i, '[EMAIL?]').
         gsub(/\b(?:(?:\+?1\s*(?:[.-]\s*)?)?(?:\(\s*([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9])\s*\)|([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]))\s*(?:[.-]\s*)?)?([2-9]1[02-9]|[2-9][02-9]1|[2-9][02-9]{2})\s*(?:[.-]\s*)?([0-9]{4})(?:\s*(?:#|x\.?|ext\.?|extension)\s*(\d+))?\b/, '[PHONE?]').
         gsub(/\b[0-9][0-9\-]{6,}[0-9]\b/, '[CC/BANK?]')
diff --git a/lib/workers/pager_duty_acknowledger.rb b/lib/workers/pager_duty_acknowledger.rb
index a4e2504d..a56a689d 100644
--- a/lib/workers/pager_duty_acknowledger.rb
+++ b/lib/workers/pager_duty_acknowledger.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # when a Bug is marked as irrelevant or assigned to a User.
 
 class PagerDutyAcknowledger
+  include BackgroundRunner::Job
 
   # Creates a new instance and sends a PagerDuty acknowledgement.
   #
@@ -65,7 +66,7 @@ def description
 
   def details
     {
-        'assigned_user' => @bug.assigned_user.try(:name)
+        'assigned_user' => @bug.assigned_user.try!(:name)
     }
   end
 end
diff --git a/lib/workers/pager_duty_notifier.rb b/lib/workers/pager_duty_notifier.rb
index 98cd375e..8645204c 100644
--- a/lib/workers/pager_duty_notifier.rb
+++ b/lib/workers/pager_duty_notifier.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # incident. The incident key is shared with other Occurrences of the same Bug.
 
 class PagerDutyNotifier
+  include BackgroundRunner::Job
 
   # Creates a new instance and sends a PagerDuty notification.
   #
@@ -36,31 +37,40 @@ def initialize(occurrence)
   # Sends a PagerDuty API call creating a new incident (if appropriate).
 
   def perform
-    if should_notify_pagerduty?
+    if should_notify_pagerduty_of_new_occurrence? || should_notify_pagerduty_when_tripped?
       @occurrence.bug.environment.project.pagerduty.trigger description,
                                                             @occurrence.bug.pagerduty_incident_key,
                                                             details
+      @occurrence.bug.update_attribute :page_last_tripped_at, Time.now
     end
   end
 
   private
 
   def should_notify_pagerduty?
-    !@occurrence.bug.irrelevant? &&
-        !@occurrence.bug.assigned_user_id &&
-        @occurrence.bug.environment.notifies_pagerduty? &&
+    @occurrence.bug.environment.notifies_pagerduty? &&
         @occurrence.bug.environment.project.pagerduty_enabled? &&
-        @occurrence.bug.environment.project.pagerduty_service_key &&
+        @occurrence.bug.environment.project.pagerduty_service_key
+
+  end
+
+  def should_notify_pagerduty_of_new_occurrence?
+    should_notify_pagerduty? &&
+        !@occurrence.bug.irrelevant? &&
+        !@occurrence.bug.assigned_user_id &&
         (@occurrence.bug.occurrences_count > @occurrence.bug.environment.project.critical_threshold ||
             @occurrence.bug.environment.project.always_notify_pagerduty?)
+  end
 
+  def should_notify_pagerduty_when_tripped?
+    should_notify_pagerduty? && @occurrence.bug.page_threshold_tripped?
   end
 
   def description
     I18n.t 'workers.pagerduty.incident.description',
            class_name: @occurrence.bug.class_name,
            file_name:  File.basename(@occurrence.bug.file),
-           line:       @occurrence.bug.special_file? ? t('workers.pagerduty.not_applicable') : @occurrence.bug.line,
+           line:       @occurrence.bug.special_file? ? I18n.t('workers.pagerduty.not_applicable') : @occurrence.bug.line,
            message:    @occurrence.message,
            locale:     @occurrence.bug.environment.project.locale
   end
diff --git a/lib/workers/pager_duty_resolver.rb b/lib/workers/pager_duty_resolver.rb
index de50cf2f..a77c5f79 100644
--- a/lib/workers/pager_duty_resolver.rb
+++ b/lib/workers/pager_duty_resolver.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/lib/workers/project_repo_fetcher.rb b/lib/workers/project_repo_fetcher.rb
index baa61e25..aec17a57 100644
--- a/lib/workers/project_repo_fetcher.rb
+++ b/lib/workers/project_repo_fetcher.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,10 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-# Very simple worker that fetches a {Project}'s repository. Encapsulated into a
-# separate class just to make it easier for potential future Resque integration.
+# Very simple worker that fetches a {Project}'s repository.
 
 class ProjectRepoFetcher
+  include BackgroundRunner::Job
 
   # Creates a new instance and calls {#perform} on it.
   #
diff --git a/lib/workers/source_map_creator.rb b/lib/workers/source_map_creator.rb
new file mode 100644
index 00000000..9ebf02ef
--- /dev/null
+++ b/lib/workers/source_map_creator.rb
@@ -0,0 +1,48 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Worker that decodes a source map from parameters given to the API controller,
+# and creates the {SourceMap} object.
+
+class SourceMapCreator
+  include BackgroundRunner::Job
+
+  # Creates a new instance and creates the SourceMap.
+  #
+  # @param [Hash] params Parameters passed to the API controller.
+
+  def self.perform(params)
+    new(params).perform
+  end
+
+  # Creates a new instance with the given parameters.
+  #
+  # @param [Hash] params Parameters passed to the API controller.
+
+  def initialize(params)
+    @params = params
+  end
+
+  # Decodes parameters and creates the SourceMap.
+
+  def perform
+    project = Project.find_by_api_key(@params['api_key']) or raise(API::UnknownAPIKeyError)
+    project.
+        environments.with_name(@params['environment']).find_or_create!(name: @params['environment']).
+        source_maps.create(raw_map:  @params['sourcemap'],
+                           revision: @params['revision'],
+                           from:     @params['from'],
+                           to:       @params['to'])
+  end
+end
diff --git a/lib/workers/source_map_worker.rb b/lib/workers/source_map_worker.rb
index 122ca841..edaa7483 100644
--- a/lib/workers/source_map_worker.rb
+++ b/lib/workers/source_map_worker.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # SourceMap, and attempts to sourcemap them using the new map.
 
 class SourceMapWorker
+  include BackgroundRunner::Job
 
   # Creates a new worker instance and performs a sourcemapping.
   #
diff --git a/lib/workers/symbolication_creator.rb b/lib/workers/symbolication_creator.rb
new file mode 100644
index 00000000..c9edce9d
--- /dev/null
+++ b/lib/workers/symbolication_creator.rb
@@ -0,0 +1,46 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Worker that decodes a symbolication table from parameters given to the API
+# controller, and creates the {Symbolication} object.
+
+class SymbolicationCreator
+  include BackgroundRunner::Job
+
+  # Creates a new instance and creates the Symbolication.
+  #
+  # @param [Hash] params Parameters passed to the API controller.
+
+  def self.perform(params)
+    new(params).perform
+  end
+
+  # Creates a new instance with the given parameters.
+  #
+  # @param [Hash] params Parameters passed to the API controller.
+
+  def initialize(params)
+    @params = params
+  end
+
+  # Decodes parameters and creates the Symbolication.
+
+  def perform
+    @params['symbolications'].each do |attrs|
+      Symbolication.where(uuid: attrs['uuid']).create_or_update do |symbolication|
+        symbolication.send :write_attribute, :symbols, attrs['symbols']
+        symbolication.send :write_attribute, :lines, attrs['lines']
+      end
+    end  end
+end
diff --git a/lib/workers/symbolication_worker.rb b/lib/workers/symbolication_worker.rb
index 4742c25a..bea82dee 100644
--- a/lib/workers/symbolication_worker.rb
+++ b/lib/workers/symbolication_worker.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 # Symbolication, and attempts to symbolicate them using the new map.
 
 class SymbolicationWorker
+  include BackgroundRunner::Job
 
   # Creates a new worker instance and performs a symbolication.
   #
diff --git a/public/400.html b/public/400.html
new file mode 100644
index 00000000..cea0e062
--- /dev/null
+++ b/public/400.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was not permitted (400)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/400.html -->
+  <div class="dialog">
+    <h1>The change you wanted was not permitted.</h1>
+    <p>Maybe you tried to change an attribute you didn't have access to.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.html b/public/422.html
index 83660ab1..36c37b6a 100644
--- a/public/422.html
+++ b/public/422.html
@@ -20,7 +20,7 @@
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <h1>The change you wanted was rejected.</h1>
-    <p>Maybe you tried to change something you didn't have access to.</p>
+    <p>Maybe one of your attributes had an invalid value.</p>
   </div>
 </body>
 </html>
diff --git a/script/all_specs.sh b/script/all_specs.sh
index 844cba9e..b99e368a 100755
--- a/script/all_specs.sh
+++ b/script/all_specs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-#
-# Copyright 2012 Square Inc.
+
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 # * MRI and JRuby
 # * LDAP-based and password-based authentication
 # * LDAP authentication with and without a bind DN
-#rvm
+#
 # All specs are run with JIRA and PagerDuty enabled.
 #
 # Note: This will take a long time, and requires that you have JRuby and MRI
@@ -29,43 +29,47 @@
 # It must be run with a clean `config/environments/test` directory. If it is
 # aborted partway through, you will need to clean up the files yourself.
 
+# Change this to, e.g., bundle update
+BUNDLE="bundle"
 # Change this to test only certain spec files
 COMMAND="rspec spec"
 
 TESTDIR="config/environments/test"
 AUTHFILE="${TESTDIR}/authentication.yml"
+ARFILE="${TESTDIR}/activerecord.yml"
+CONCFILE="${TESTDIR}/concurrency.yml"
 
-##### Cleanliness checks
-
-if [[ `git status --porcelain -- ${TESTDIR}` ]]; then
-    echo This script must be run with a clean ${TESTDIR} directory.
-    exit 1
-fi
+function reset_config() {
+    git checkout Gemfile.lock
 
-##### Perform global configuration
-
-# JIRA
-cat > ${TESTDIR}/jira.yml <<YAML
+    # JIRA
+    cat > ${TESTDIR}/jira.yml <<YAML
 ---
 disabled: false
 YAML
 
-# PagerDuty
-cat > ${TESTDIR}/pagerduty.yml <<YAML
+    # PagerDuty
+    cat > ${TESTDIR}/pagerduty.yml <<YAML
 ---
 disabled: false
 YAML
 
-# Authentication
-cat > ${AUTHFILE} <<YAML
+    # Authentication
+    cat > ${AUTHFILE} <<YAML
 ---
 strategy: password
 password:
   salt: abc123
 YAML
 
-# Mailer
-cat > ${TESTDIR}/mailer.yml <<YAML
+    # Active Record
+    cat > ${ARFILE} <<YAML
+---
+cursor: false
+YAML
+
+    # Mailer
+    cat > ${TESTDIR}/mailer.yml <<YAML
 ---
 from: squash@example.com
 domain: example.com
@@ -74,36 +78,99 @@ default_url_options:
   protocol: http
 YAML
 
-##### 1. MRI (password auth)
-rvm 1.9.3@squash exec ${COMMAND}
+    # Concurrency
+    cat > ${CONCFILE} <<YAML
+---
+background_runner: Multithread
+multithread:
+  priority_threshold: 50
+  pool_size: 20
+  max_threads: 100
+  priority:
+    CommentNotificationMailer: 80
+    DeployFixMarker: 70
+    DeployNotificationMailer: 80
+    JiraStatusWorker: 20
+    ObfuscationMapWorker: 60
+    OccurrenceNotificationMailer: 80
+    OccurrencesWorker: 40
+    PagerDutyAcknowledger: 20
+    PagerDutyNotifier: 80
+    PagerDutyResolver: 20
+    ProjectRepoFetcher: 30
+    SourceMapWorker: 60
+    SymbolicationWorker: 60
+YAML
+}
+
+##### Cleanliness checks
+function check_clean() {
+    if [[ `git status --porcelain -- ${TESTDIR}` ]]; then
+        echo This script must be run with a clean ${TESTDIR} directory.
+        exit 1
+    fi
+}
+
+##### MRI (password auth)
+function run_password() {
+    reset_config
+    rvm 2.3@squash exec ${BUNDLE}
+    rvm 2.3@squash exec ${COMMAND}
+
+    echo
+    echo "***** That was MRI with password auth ******"
+    echo
+}
+
+##### MRI (PostgreSQL cursors)
+function run_cursors() {
+    reset_config
+    cat > ${ARFILE} <<YAML
+---
+cursors: true
+YAML
+    rvm 2.3@squash exec ${BUNDLE}
+    rvm 2.3@squash exec ${COMMAND}
+
+    echo
+    echo "***** That was MRI with password auth w/PostgreSQL cursors ******"
+    echo
+}
 
-echo
-echo "***** That was MRI with password auth ******"
-echo
 
-##### 2. MRI (password auth w/registration disabled)
-cat > ${AUTHFILE} <<YAML
+##### MRI (password auth w/registration disabled)
+function run_reg_disabled() {
+    reset_config
+    cat > ${AUTHFILE} <<YAML
 ---
 strategy: password
 password:
   salt: abc123
 registration_enabled: false
 YAML
-rvm 1.9.3@squash exec ${COMMAND}
+    rvm 2.3@squash exec ${BUNDLE}
+    rvm 2.3@squash exec ${COMMAND}
 
-echo
-echo "***** That was MRI with password auth w/registration disabled ******"
-echo
+    echo
+    echo "***** That was MRI with password auth w/registration disabled ******"
+    echo
+}
 
-##### 3. JRuby (password auth)
-rvm jruby@squash exec ${COMMAND}
+##### JRuby (password auth)
+function run_jruby() {
+    reset_config
+    rvm jruby@squash exec ${BUNDLE}
+    rvm jruby@squash exec ${COMMAND}
 
-echo
-echo "***** That was JRuby with password auth ******"
-echo
+    echo
+    echo "***** That was JRuby with password auth ******"
+    echo
+}
 
-##### 4. LDAP authentication, no bind DN (MRI)
-cat > ${AUTHFILE} <<YAML
+##### LDAP authentication, no bind DN (MRI)
+function run_ldap() {
+    reset_config
+    cat > ${AUTHFILE} <<YAML
 ---
 strategy: ldap
 ldap:
@@ -113,14 +180,18 @@ ldap:
   tree_base: cn=users,dc=mycompany,dc=com
   search_key: uid
 YAML
-rvm 1.9.3@squash exec ${COMMAND}
+    rvm 2.3@squash exec ${BUNDLE}
+    rvm 2.3@squash exec ${COMMAND}
 
-echo
-echo "***** That was MRI with LDAP auth, no bind DN ******"
-echo
+    echo
+    echo "***** That was MRI with LDAP auth, no bind DN ******"
+    echo
+}
 
-##### 5. LDAP authentication, with bind DN (MRI)
-cat > ${AUTHFILE} <<YAML
+##### LDAP authentication, with bind DN (MRI)
+function run_ldap_bind_dn() {
+    reset_config
+    cat > ${AUTHFILE} <<YAML
 ---
 strategy: ldap
 ldap:
@@ -132,13 +203,111 @@ ldap:
   bind_dn: cn=admins,ou=System,dc=mycompany,dc=com
   bind_password: password123
 YAML
-rvm 1.9.3@squash exec ${COMMAND}
+    rvm 2.3@squash exec ${BUNDLE}
+    rvm 2.3@squash exec ${COMMAND}
+
+    echo
+    echo "***** That was MRI with LDAP auth + bind DN ******"
+    echo
+}
+
+##### Resque integration (MRI)
+function run_resque() {
+    reset_config
+    cat > ${CONCFILE} <<YAML
+---
+background_runner: Resque
+resque:
+  development: "localhost:6379"
+  production: "localhost:6379"
+  test: "localhost:6379"
+  pool:
+    squash: 2
+YAML
+    rvm 2.3@squash exec ${BUNDLE}
+    rvm 2.3@squash exec ${COMMAND}
+
+    echo
+    echo "***** That was MRI with Resque ******"
+    echo
+}
+
+##### Sidekiq integration (MRI)
+function run_sidekiq() {
+    reset_config
+    cat > ${CONCFILE} <<YAML
+---
+background_runner: Sidekiq
+sidekiq:
+  redis:
+    queue: "localhost:6379"
+YAML
+    rvm 2.3@squash exec ${BUNDLE}
+    rvm 2.3@squash exec ${COMMAND}
 
-echo
-echo "***** That was MRI with LDAP auth + bind DN ******"
-echo
+    echo
+    echo "***** That was MRI with Sidekiq ******"
+    echo
+}
+
+##### MRI 2.0 (password auth)
+function run_mri20() {
+    reset_config
+    rvm 2.0@squash exec ${BUNDLE}
+    rvm 2.0@squash exec ${COMMAND}
+
+    echo
+    echo "***** That was MRI 2.0 with password auth ******"
+    echo
+}
+
+##### MRI 2.1 (password auth)
+function run_mri21() {
+    reset_config
+    rvm 2.1@squash exec ${BUNDLE}
+    rvm 2.1@squash exec ${COMMAND}
+
+    echo
+    echo "***** That was MRI 2.1 with password auth ******"
+    echo
+}
+
+##### MRI 2.2 (password auth)
+function run_mri22() {
+    reset_config
+    rvm 2.2@squash exec ${BUNDLE}
+    rvm 2.2@squash exec ${COMMAND}
+
+    echo
+    echo "***** That was MRI 2.2 with password auth ******"
+    echo
+}
 
 ##### Reset configuration
+function restore() {
+    git checkout Gemfile.lock
+    git checkout ${TESTDIR}
+    git clean -df -- ${TESTDIR}
+}
+
+check_clean
+
+rvm 2.0 exec rvm gemset create squash
+rvm 2.1 exec rvm gemset create squash
+rvm 2.2 exec rvm gemset create squash
+rvm 2.3 exec rvm gemset create squash
+rvm jruby exec rvm gemset create squash
+
+run_password
+run_cursors
+run_reg_disabled
+run_jruby
+run_ldap
+run_ldap_bind_dn
+run_resque
+run_sidekiq
+run_mri20
+run_mri21
+run_mri22
 
-git checkout ${TESTDIR}
-git clean -df -- ${TESTDIR}
+restore
diff --git a/script/jira_oauth.rb b/script/jira_oauth.rb
index ba2cd5ab..86f79f12 100644
--- a/script/jira_oauth.rb
+++ b/script/jira_oauth.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/script/mysql_message_templates.rb b/script/mysql_message_templates.rb
index 4eb2d8e7..ae77e98f 100644
--- a/script/mysql_message_templates.rb
+++ b/script/mysql_message_templates.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/script/psql_message_templates.rb b/script/psql_message_templates.rb
index 659604da..628acd22 100644
--- a/script/psql_message_templates.rb
+++ b/script/psql_message_templates.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/controllers/account/bugs_controller_spec.rb b/spec/controllers/account/bugs_controller_spec.rb
index ab91dc2f..24ba11c1 100644
--- a/spec/controllers/account/bugs_controller_spec.rb
+++ b/spec/controllers/account/bugs_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Account::BugsController do
+RSpec.describe Account::BugsController, type: :controller do
   describe "#index" do
     def sort(bugs, field, reverse=false)
       bugs.sort_by! { |b| [b.send(field), b.number] }
@@ -24,7 +24,7 @@ def sort(bugs, field, reverse=false)
 
     it "should require a logged-in user" do
       get :index
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -33,8 +33,6 @@ def sort(bugs, field, reverse=false)
       context '[JSON]' do
         context "[type = watched]" do
           before :all do
-            Account::BugsController::PER_PAGE = 5 # speed it up
-
             @user = FactoryGirl.create(:user)
             env   = FactoryGirl.create(:environment)
             FactoryGirl.create :membership, user: @user, project: env.project
@@ -51,28 +49,28 @@ def sort(bugs, field, reverse=false)
             @watches = @user.watches.includes(:bug).order('created_at DESC') # reload to get new triggered values
           end
 
+          before(:each) { stub_const 'Account::BugsController::PER_PAGE', 5 } # speed it up
+
           it "should load 50 of the most recently watched bugs by default" do
             get :index, format: 'json', type: 'watched'
-            response.status.should eql(200)
-            JSON.parse(response.body).map { |r| r['number'] }.should eql(@watches.map(&:bug).map(&:number)[0, 5])
+            expect(response.status).to eql(200)
+            expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@watches.map(&:bug).map(&:number)[0, 5])
           end
 
           it "should return the next 50 bugs when given a last parameter" do
             get :index, last: @watches[4].bug.id, format: 'json', type: 'watched'
-            response.status.should eql(200)
-            JSON.parse(response.body).map { |r| r['number'] }.should eql(@watches.map(&:bug).map(&:number)[5, 5])
+            expect(response.status).to eql(200)
+            expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@watches.map(&:bug).map(&:number)[5, 5])
           end
 
           it "should decorate the bug JSON" do
             get :index, format: 'json', type: 'watched'
-            JSON.parse(response.body).each { |bug| bug['href'].should =~ /\/projects\/.+?\/environments\/.+?\/bugs\/#{bug['number']}/ }
+            JSON.parse(response.body).each { |bug| expect(bug['href']).to match(/\/projects\/.+?\/environments\/.+?\/bugs\/#{bug['number']}/) }
           end
         end
 
         context "[type = assigned]" do
           before :all do
-            Account::BugsController::PER_PAGE = 5 # speed it up
-
             @user = FactoryGirl.create(:user)
             env   = FactoryGirl.create(:environment)
             FactoryGirl.create :membership, user: @user, project: env.project
@@ -89,21 +87,23 @@ def sort(bugs, field, reverse=false)
             sort @bugs, 'latest_occurrence', true
           end
 
+          before(:each) { stub_const 'Account::BugsController::PER_PAGE', 5 } # speed it up
+
           it "should load 50 of the newest assigned bugs by default" do
             get :index, format: 'json'
-            response.status.should eql(200)
-            JSON.parse(response.body).map { |r| r['number'] }.should eql(@bugs.map(&:number)[0, 5])
+            expect(response.status).to eql(200)
+            expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@bugs.map(&:number)[0, 5])
           end
 
           it "should return the next 50 bugs when given a last parameter" do
             get :index, last: @bugs[4].number, format: 'json'
-            response.status.should eql(200)
-            JSON.parse(response.body).map { |r| r['number'] }.should eql(@bugs.map(&:number)[5, 5])
+            expect(response.status).to eql(200)
+            expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@bugs.map(&:number)[5, 5])
           end
 
           it "should decorate the bug JSON" do
             get :index, format: 'json'
-            JSON.parse(response.body).each { |bug| bug['href'].should =~ /\/projects\/.+?\/environments\/.+?\/bugs\/#{bug['number']}/ }
+            JSON.parse(response.body).each { |bug| expect(bug['href']).to match(/\/projects\/.+?\/environments\/.+?\/bugs\/#{bug['number']}/) }
           end
         end
       end
diff --git a/spec/controllers/account/events_controller_spec.rb b/spec/controllers/account/events_controller_spec.rb
index 4d2c7dbe..9a51b1eb 100644
--- a/spec/controllers/account/events_controller_spec.rb
+++ b/spec/controllers/account/events_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,15 +12,13 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Account::EventsController do
+RSpec.describe Account::EventsController, type: :controller do
   include EventDecoration
 
   describe "#index" do
     before :all do
-      Account::EventsController::PER_PAGE = 5 # speed it up
-
       membership = FactoryGirl.create(:membership)
       @env       = FactoryGirl.create(:environment, project: membership.project)
       @bug       = FactoryGirl.create(:bug, environment: @env)
@@ -39,9 +37,11 @@
       @events.each { |event| FactoryGirl.create :user_event, event: event, user: @user, created_at: event.created_at }
     end
 
+    before(:each) { stub_const 'Account::EventsController::PER_PAGE', 5 } # speed it up
+
     it "should require a logged-in user" do
       get :index, format: 'json'
-      response.status.should eql(401)
+      expect(response.status).to eql(401)
     end
 
     context '[authenticated]' do
@@ -49,8 +49,8 @@
 
       it "should load the 50 most recent events" do
         get :index, format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |e| e['kind'] }.should eql(@events.sort_by(&:created_at).reverse.map(&:kind)[0, 5])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |e| e['kind'] }).to eql(@events.sort_by(&:created_at).reverse.map(&:kind)[0, 5])
       end
 
       it "should return the next 50 events when given a last parameter" do
@@ -58,21 +58,21 @@
         @events.reverse!
 
         get :index, last: @events[4].id, format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |e| e['kind'] }.should eql(@events.map(&:kind)[5, 5])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |e| e['kind'] }).to eql(@events.map(&:kind)[5, 5])
       end
 
       it "should decorate the response" do
         get :index, format: 'json'
         JSON.parse(response.body).zip(@events.sort_by(&:created_at).reverse).each do |(hsh, event)|
-          hsh['icon'].should include(icon_for_event(event))
-          hsh['user_url'].should eql(user_url(event.user))
-          hsh['assignee_url'].should eql(user_url(event.assignee))
-          hsh['occurrence_url'].should eql(project_environment_bug_occurrence_url(@env.project, @env, @bug, event.occurrence))
-          hsh['comment_body'].should eql(ApplicationController.new.send(:markdown).(event.comment.body))
-          hsh['resolution_url'].should eql(@bug.resolution_revision)
-          hsh['assignee_you'].should eql(event.assignee == @user)
-          hsh['user_you'].should eql(@user == event.user)
+          expect(hsh['icon']).to include(icon_for_event(event))
+          expect(hsh['user_url']).to eql(user_url(event.user))
+          expect(hsh['assignee_url']).to eql(user_url(event.assignee))
+          expect(hsh['occurrence_url']).to eql(project_environment_bug_occurrence_url(@env.project, @env, @bug, event.occurrence))
+          expect(hsh['comment_body']).to eql(ApplicationController.new.send(:markdown).(event.comment.body))
+          expect(hsh['resolution_url']).to eql(@bug.resolution_revision)
+          expect(hsh['assignee_you']).to eql(event.assignee == @user)
+          expect(hsh['user_you']).to eql(@user == event.user)
         end
       end
 
@@ -85,9 +85,9 @@
         get :index, format: 'json'
 
         json = JSON.parse(response.body)
-        json.first['kind'].should eql('dupe')
-        json.first['original_url'].should eql(project_environment_bug_url(original.environment.project, original.environment, original))
-        json.first['original']['number'].should eql(original.number)
+        expect(json.first['kind']).to eql('dupe')
+        expect(json.first['original_url']).to eql(project_environment_bug_url(original.environment.project, original.environment, original))
+        expect(json.first['original']['number']).to eql(original.number)
       end
     end
   end
diff --git a/spec/controllers/account/memberships_controller_spec.rb b/spec/controllers/account/memberships_controller_spec.rb
index 8c46b3b0..15fa3880 100644
--- a/spec/controllers/account/memberships_controller_spec.rb
+++ b/spec/controllers/account/memberships_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Account::MembershipsController do
+RSpec.describe Account::MembershipsController, type: :controller do
   describe "#index" do
     before :all do
       @user               = FactoryGirl.create(:user)
@@ -24,8 +24,8 @@
 
     it "should require a logged-in user" do
       get :index, format: 'json'
-      response.status.should eql(401)
-      response.body.should be_blank
+      expect(response.status).to eql(401)
+      expect(response.body).to be_blank
     end
 
     context "[authenticated]" do
@@ -33,14 +33,14 @@
 
       it "should load the first 10 memberships" do
         get :index, format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |r| r['project']['name'] }.should eql(@memberships.sort_by(&:created_at).reverse.map(&:project).map(&:name)[0, 10])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |r| r['project']['name'] }).to eql(@memberships.sort_by(&:created_at).reverse.map(&:project).map(&:name)[0, 10])
       end
 
       it "should filter memberships by name when a query is given" do
         get :index, format: 'json', query: 'filter'
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |r| r['project']['name'] }.should eql(@filter_memberships.sort_by(&:created_at).reverse.map(&:project).map(&:name)[0, 10])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |r| r['project']['name'] }).to eql(@filter_memberships.sort_by(&:created_at).reverse.map(&:project).map(&:name)[0, 10])
       end
     end
   end
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 1a33a248..7963922d 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,44 +12,42 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe AccountsController do
+RSpec.describe AccountsController, type: :controller do
   describe "#update" do
-    before :all do
+    before :each do
       @user  = FactoryGirl.create(:user)
       @attrs = {password: 'newpass', password_confirmation: 'newpass', first_name: 'NewFN', last_name: 'NewLN'}
     end
 
     it "should require a logged-in user" do
-      put :update, user: @attrs
-      response.should redirect_to(login_url(next: request.fullpath))
-      -> { @user.reload }.should_not change(@user, :first_name)
+      patch :update, user: @attrs
+      expect(response).to redirect_to(login_url(next: request.fullpath))
+      expect { @user.reload }.not_to change(@user, :first_name)
     end
 
     context '[authenticated]' do
       before(:each) { login_as @user }
 
       it "should update the user and redirect to the account page" do
-        put :update, user: @attrs
-        response.should redirect_to(account_url)
+        patch :update, user: @attrs
+        expect(response).to redirect_to(account_url)
 
-        @user.reload.first_name.should eql('NewFN')
-        @user.last_name.should eql('NewLN')
-        @user.authentic?('newpass').should be_true
+        expect(@user.reload.first_name).to eql('NewFN')
+        expect(@user.last_name).to eql('NewLN')
+        expect(@user.authentic?('newpass')).to eql(true)
       end
 
       it "should render the account page on failure" do
-        put :update, user: @attrs.merge(password_confirmation: 'oops')
-        response.should render_template('show')
+        patch :update, user: @attrs.merge(password_confirmation: 'oops')
+        expect(response).to render_template('show')
       end
 
       it "should not update the password if it's not provided" do
         @user.reload
-        put :update, user: @attrs.merge('password' => '')
-        response.should redirect_to(account_url)
-
-        -> { @user.reload }.should_not change(@user, :crypted_password)
+        patch :update, user: @attrs.merge('password' => '')
+        expect { @user.reload }.not_to change(@user, :crypted_password)
       end
     end
   end if Squash::Configuration.authentication.strategy == 'password'
diff --git a/spec/controllers/additions/authentication_helpers_spec.rb b/spec/controllers/additions/authentication_helpers_spec.rb
index 0112b956..4e31a652 100644
--- a/spec/controllers/additions/authentication_helpers_spec.rb
+++ b/spec/controllers/additions/authentication_helpers_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-class FakeController
+class FakeController < ApplicationController
   def self.helper_method(*args) end
   def logger(*args) Rails.logger end
   def session() @session ||= Hash.new end
@@ -25,7 +25,7 @@ def _current_user=(u) @current_user = u end
   include AuthenticationHelpers
 end
 
-describe AuthenticationHelpers do
+RSpec.describe AuthenticationHelpers, type: :integration do
   before(:all) { @user = FactoryGirl.create(:user) }
   before(:each) { @controller = FakeController.new }
 
@@ -36,8 +36,8 @@ def _current_user=(u) @current_user = u end
 
       @controller.log_out
 
-      @controller.session[:user_id].should be_nil
-      @controller._current_user.should be_nil
+      expect(@controller.session[:user_id]).to be_nil
+      expect(@controller._current_user).to be_nil
     end
   end
 
@@ -45,76 +45,76 @@ def _current_user=(u) @current_user = u end
     it "should return the cached user" do
       @controller._current_user     = @user
       @controller.session[:user_id] = @user.id
-      @controller.current_user.should eql(@user)
+      expect(@controller.current_user).to eql(@user)
     end
 
     it "should locate the user from the session" do
       @controller.session[:user_id] = @user.id
-      @controller.current_user.should eql(@user)
-      @controller._current_user.should eql(@user)
+      expect(@controller.current_user).to eql(@user)
+      expect(@controller._current_user).to eql(@user)
     end
 
     it "should return nil if the session is blank, even if there is a cached user" do
       @controller._current_user = @user
-      @controller.current_user.should be_nil
+      expect(@controller.current_user).to be_nil
     end
   end
 
   describe "#logged_in?" do
     it "should return true if the user is logged in" do
       @controller.send :log_in_user,  @user
-      @controller.logged_in?.should be_true
+      expect(@controller.logged_in?).to eql(true)
     end
 
     it "should return false if the user is logged out" do
       @controller.log_out
-      @controller.logged_in?.should be_false
+      expect(@controller.logged_in?).to eql(false)
     end
   end
 
   describe "#logged_out?" do
     it "should return true if the user is logged out" do
       @controller.log_out
-      @controller.logged_out?.should be_true
+      expect(@controller.logged_out?).to eql(true)
     end
 
     it "should return false if the user is logged in" do
       @controller.send :log_in_user,  @user
-      @controller.logged_out?.should be_false
+      expect(@controller.logged_out?).to eql(false)
     end
   end
 
   describe "#login_required" do
     it "should return true if the user is logged in" do
       @controller.send :log_in_user,  @user
-      @controller.send(:login_required).should be_true
+      expect(@controller.send(:login_required)).to eql(true)
     end
 
     it "should return false and redirect if the user is logged out" do
-      @controller.should_receive(:respond_to).once
+      expect(@controller).to receive(:respond_to).once
       @controller.log_out
-      @controller.send(:login_required).should be_false
+      expect(@controller.send(:login_required)).to eql(false)
     end
   end
 
   describe "#must_be_unauthenticated" do
     it "should return false and redirect if the user is logged in" do
-      @controller.should_receive(:respond_to).once
+      expect(@controller).to receive(:respond_to).once
       @controller.send :log_in_user,  @user
-      @controller.send(:must_be_unauthenticated).should be_false
+      expect(@controller.send(:must_be_unauthenticated)).to eql(false)
     end
 
     it "should return true if the user is logged out" do
       @controller.log_out
-      @controller.send(:must_be_unauthenticated).should be_true
+      expect(@controller.send(:must_be_unauthenticated)).to eql(true)
     end
   end
 
   describe "#log_in_user" do
     it "should set the session and the cached user" do
       @controller.send :log_in_user,  @user
-      @controller.session[:user_id].should eql(@user.id)
-      @controller._current_user.should eql(@user)
+      expect(@controller.session[:user_id]).to eql(@user.id)
+      expect(@controller._current_user).to eql(@user)
     end
   end
 end
diff --git a/spec/controllers/additions/ldap_authentication_helpers_spec.rb b/spec/controllers/additions/ldap_authentication_helpers_spec.rb
index 7f67fe6c..62d34e6d 100644
--- a/spec/controllers/additions/ldap_authentication_helpers_spec.rb
+++ b/spec/controllers/additions/ldap_authentication_helpers_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
 if Squash::Configuration.authentication.strategy == 'ldap'
   class FakeController
@@ -23,166 +23,162 @@ def logger(*) Rails.logger end
     include LdapAuthenticationHelpers
   end
 
-  describe LdapAuthenticationHelpers do
+  RSpec.describe LdapAuthenticationHelpers, type: :model do
     describe "#log_in" do
       before(:all) { @user = FactoryGirl.create(:user) }
 
       before :each do
         @controller = FakeController.new
-        @ldap       = mock('Net::LDAP')
-        @controller.stub!(:build_ldap_interface).and_return(@ldap)
+        @ldap       = double('Net::LDAP')
+        allow(@controller).to receive(:build_ldap_interface).and_return(@ldap)
       end
 
       it "should return true if the LDAP entry exists and can bind" do
-        entry = {
+        entry = OpenStruct.new(
             givenname: 'Foo',
             sn:        'Bar',
             dn:        "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username},#{Squash::Configuration.authentication.ldap.tree_base}"
-        }
-        entry.stub(:dn).and_return(entry[:dn])
+        )
 
-        @ldap.should_receive(:search).once do |hsh|
-          hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username}"
-        end.and_yield(entry)
+        expect(@ldap).to receive(:search).once { |hsh|
+                           hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username}"
+                         }.and_yield(entry)
 
-        @ldap.should_receive(:auth).once.with(
-            /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
-            'password'
-        )
+        expect(@ldap).to receive(:auth).once.with(
+                             /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
+                             'password'
+                         )
 
         if Squash::Configuration.authentication.ldap[:bind_dn]
-          @ldap.should_receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
+          expect(@ldap).to receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
         end
 
-        @ldap.stub!(:bind).and_return(true)
+        allow(@ldap).to receive(:bind).and_return(true)
 
-        @controller.should_receive(:log_in_user).once.with(@user)
-        @controller.log_in(@user.username, 'password').should be_true
+        expect(@controller).to receive(:log_in_user).once.with(@user)
+        expect(@controller.log_in(@user.username, 'password')).to eql(true)
       end
 
       it "should extract the username from an email address login" do
-        entry = {
+        entry = OpenStruct.new(
             givenname: 'Foo',
             sn:        'Bar',
             dn:        "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username},#{Squash::Configuration.authentication.ldap.tree_base}"
-        }
-        entry.stub(:dn).and_return(entry[:dn])
+        )
 
-        @ldap.should_receive(:search).once do |hsh|
-          hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username}"
-        end.and_yield(entry)
+        expect(@ldap).to receive(:search).once { |hsh|
+                           hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username}"
+                         }.and_yield(entry)
 
-        @ldap.should_receive(:auth).once.with(
-            /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
-            'password'
-        )
+        expect(@ldap).to receive(:auth).once.with(
+                             /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
+                             'password'
+                         )
 
         if Squash::Configuration.authentication.ldap[:bind_dn]
-          @ldap.should_receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
+          expect(@ldap).to receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
         end
 
-        @ldap.stub!(:bind).and_return(true)
+        allow(@ldap).to receive(:bind).and_return(true)
 
-        @controller.should_receive(:log_in_user).once.with(@user)
-        @controller.log_in("#{@user.username}@#{Squash::Configuration.mailer.domain}", 'password').should be_true
+        expect(@controller).to receive(:log_in_user).once.with(@user)
+        expect(@controller.log_in("#{@user.username}@#{Squash::Configuration.mailer.domain}", 'password')).to eql(true)
       end
 
       it "should return false if the LDAP entry does not exist" do
-        @ldap.should_receive(:search).once do |hsh|
+        expect(@ldap).to receive(:search).once do |hsh|
           hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username}"
         end
 
         if Squash::Configuration.authentication.ldap[:bind_dn]
-          @ldap.should_receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
+          expect(@ldap).to receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
         else
-          @ldap.should_receive(:auth).once.with(
-              /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
-              'password'
-          )
+          expect(@ldap).to receive(:auth).once.with(
+                               /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
+                               'password'
+                           )
         end
 
-        @ldap.stub!(:bind).and_return(true)
+        allow(@ldap).to receive(:bind).and_return(true)
 
-        @controller.should_not_receive :log_in_user
-        @controller.log_in(@user.username, 'password').should be_false
+        expect(@controller).not_to receive :log_in_user
+        expect(@controller.log_in(@user.username, 'password')).to eql(false)
       end
 
       if Squash::Configuration.authentication.ldap[:bind_dn]
         it "should return false if the user cannot bind" do
-          entry = {
+          entry = OpenStruct.new(
               givenname: 'Foo',
               sn:        'Bar',
               dn:        "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username},#{Squash::Configuration.authentication.ldap.tree_base}"
-          }
-          entry.stub(:dn).and_return(entry[:dn])
+          )
 
-          @ldap.should_receive(:search).once do |hsh|
-            hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username}"
-          end.and_yield(entry)
+          expect(@ldap).to receive(:search).once { |hsh|
+                             hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=#{@user.username}"
+                           }.and_yield(entry)
 
-          @ldap.should_receive(:auth).once.with(
-              /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
-              'password'
-          )
-          @ldap.should_receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
-          @ldap.should_receive(:bind).twice.and_return(true, false)
+          expect(@ldap).to receive(:auth).once.with(
+                               /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
+                               'password'
+                           )
+          expect(@ldap).to receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
+          expect(@ldap).to receive(:bind).twice.and_return(true, false)
 
-          @controller.should_not_receive :log_in_user
-          @controller.log_in(@user.username, 'password').should be_false
+          expect(@controller).not_to receive :log_in_user
+          expect(@controller.log_in(@user.username, 'password')).to eql(false)
         end
 
         it "should return false if the LDAP authenticator cannot bind" do
-          @ldap.should_receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
-          @ldap.stub!(:bind).once.and_return(false)
+          expect(@ldap).to receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
+          allow(@ldap).to receive(:bind).once.and_return(false)
 
-          @controller.should_not_receive :log_in_user
-          @controller.log_in(@user.username, 'password').should be_false
+          expect(@controller).not_to receive :log_in_user
+          expect(@controller.log_in(@user.username, 'password')).to eql(false)
         end
       else
         it "should return false if the user cannot bind" do
-          @ldap.should_not_receive :search
+          expect(@ldap).not_to receive :search
 
-          @ldap.should_receive(:auth).once.with(
-              /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
-              'password'
-          )
+          expect(@ldap).to receive(:auth).once.with(
+                               /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=#{Regexp.escape @user.username},/,
+                               'password'
+                           )
 
-          @ldap.should_receive(:bind).once.and_return(false)
+          expect(@ldap).to receive(:bind).once.and_return(false)
 
-          @controller.should_not_receive :log_in_user
-          @controller.log_in(@user.username, 'password').should be_false
+          expect(@controller).not_to receive :log_in_user
+          expect(@controller.log_in(@user.username, 'password')).to eql(false)
         end
       end
 
       it "should create a new user if one doesn't already exist" do
-        entry = {
+        entry = OpenStruct.new(
             givenname: 'New',
             sn:        'User',
             dn:        "#{Squash::Configuration.authentication.ldap.search_key}=newuser,#{Squash::Configuration.authentication.ldap.tree_base}"
-        }
-        entry.stub(:dn).and_return(entry[:dn])
+        )
 
-        @ldap.should_receive(:search).once do |hsh|
-          hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=newuser"
-        end.and_yield(entry)
+        expect(@ldap).to receive(:search).once { |hsh|
+                           hsh[:filter].to_raw_rfc2254 == "#{Squash::Configuration.authentication.ldap.search_key}=newuser"
+                         }.and_yield(entry)
 
-        @ldap.should_receive(:auth).once.with(
-            /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=newuser,/,
-            'password'
-        )
+        expect(@ldap).to receive(:auth).once.with(
+                             /#{Regexp.escape Squash::Configuration.authentication.ldap.search_key}=newuser,/,
+                             'password'
+                         )
 
         if Squash::Configuration.authentication.ldap[:bind_dn]
-          @ldap.should_receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
+          expect(@ldap).to receive(:auth).once.with(Squash::Configuration.authentication.ldap.bind_dn, Squash::Configuration.authentication.ldap.bind_password)
         end
 
-        @ldap.stub!(:bind).and_return(true)
+        allow(@ldap).to receive(:bind).and_return(true)
 
-        @controller.should_receive(:log_in_user).once do |user|
+        expect(@controller).to receive(:log_in_user).once do |user|
           user.username == 'newuser' &&
               user.first_name == 'New' &&
               user.last_name == 'User'
         end
-        @controller.log_in('newuser', 'password').should be_true
+        expect(@controller.log_in('newuser', 'password')).to eql(true)
       end
     end
   end
diff --git a/spec/controllers/additions/password_authentication_helpers_spec.rb b/spec/controllers/additions/password_authentication_helpers_spec.rb
index 3ad3c345..051de498 100644
--- a/spec/controllers/additions/password_authentication_helpers_spec.rb
+++ b/spec/controllers/additions/password_authentication_helpers_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
 if Squash::Configuration.authentication.strategy == 'password'
   class FakeController
@@ -23,25 +23,25 @@ def logger(*) Rails.logger end
     include PasswordAuthenticationHelpers
   end
 
-  describe PasswordAuthenticationHelpers do
+  RSpec.describe PasswordAuthenticationHelpers, type: :model do
     before(:each) { @controller = FakeController.new }
 
     describe "#log_in" do
       before(:all) { @user = FactoryGirl.create(:user, password: 'password123') }
 
       it "should accept a valid username and password" do
-        @controller.should_receive(:log_in_user).once.with(@user)
-        @controller.log_in(@user.username, 'password123').should be_true
+        expect(@controller).to receive(:log_in_user).once.with(@user)
+        expect(@controller.log_in(@user.username, 'password123')).to eql(true)
       end
 
       it "should not accept an unknown username" do
-        @controller.should_not_receive :log_in_user
-        @controller.log_in('unknown', 'password123').should be_false
+        expect(@controller).not_to receive :log_in_user
+        expect(@controller.log_in('unknown', 'password123')).to eql(false)
       end
 
       it "should not accept an invalid password" do
-        @controller.should_not_receive :log_in_user
-        @controller.log_in(@user.username, 'password-wrong').should be_false
+        expect(@controller).not_to receive :log_in_user
+        expect(@controller.log_in(@user.username, 'password-wrong')).to eql(false)
       end
     end
   end
diff --git a/spec/controllers/api/v1_controller_spec.rb b/spec/controllers/api/v1_controller_spec.rb
index 72805ecf..b458e31d 100644
--- a/spec/controllers/api/v1_controller_spec.rb
+++ b/spec/controllers/api/v1_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,21 +12,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
-require 'fdoc/spec_watcher'
+require 'rails_helper'
 
-describe Api::V1Controller do
-  include Fdoc::SpecWatcher
-
-  describe "#notify", fdoc: '/notify' do
+RSpec.describe Api::V1Controller, type: :controller do
+  describe "#notify" do
     before :all do
-      Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-      @project   = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      @project   = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
       @commit    = @project.repo.object('HEAD^')
 
       # this will be a valid exception but with a stack trace that doesn't make
       # sense in the context of the project (the files don't actually exist in the
-                                                                   # repo). this will test the scenarios where no blamed commits can be found.
+      # repo). this will test the scenarios where no blamed commits can be found.
       @exception = nil
       begin
         raise ArgumentError, "Well crap"
@@ -46,7 +43,7 @@
 
     before :each do
       Bug.delete_all
-      @valid_params = Squash::Ruby.send(:exception_info_hash, @exception, Time.now.utc, {}, nil).deep_clone
+      @valid_params                = Squash::Ruby.send(:exception_info_hash, @exception, Time.now.utc, {}, nil).deep_clone
       @valid_params['occurred_at'] = @valid_params['occurred_at'].iso8601
       @valid_params.merge!('api_key'     => @project.api_key,
                            'environment' => 'production',
@@ -56,29 +53,29 @@
 
     it "should return 403 given an invalid API key" do
       post :notify, @valid_params.merge('api_key' => 'not-found')
-      response.status.should eql(403)
+      expect(response.status).to eql(403)
     end
 
     it "should return 422 given invalid parameters" do
       post :notify, @valid_params.merge('client' => '')
-      response.status.should eql(422)
+      expect(response.status).to eql(422)
     end
 
     it "should start a worker thread and return 200 given valid parameters" do
-      mock = mock('OccurrencesWorker')
-      OccurrencesWorker.stub!(:new).and_return(mock)
-      Thread.stub!(:new).and_yield
+      mock = double('OccurrencesWorker')
+      allow(OccurrencesWorker).to receive(:new).and_return(mock)
+      allow(Thread).to receive(:new).and_yield
 
-      mock.should_receive(:perform).once
+      expect(mock).to receive(:perform).once
       post :notify, @valid_params
-      response.status.should eql(200)
+      expect(response.status).to eql(200)
     end
   end
 
-  describe "#deploy", fdoc: '/deploy' do
+  describe "#deploy" do
     before :all do
-      Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-      @project = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      @project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
     end
 
     before :each do
@@ -97,14 +94,14 @@
     %w( project environment deploy ).each do |key|
       it "should require the #{key} key" do
         post :deploy, @params.merge(key => ' ')
-        response.status.should eql(422)
+        expect(response.status).to eql(422)
       end
     end
 
     it "should return 403 if the API key is invalid" do
       @params['project'].merge!('api_key' => 'not-found')
       post :deploy, @params
-      response.status.should eql(403)
+      expect(response.status).to eql(403)
     end
 
     it "should create a new environment if one doesn't exist with that name" do
@@ -112,31 +109,31 @@
       post :deploy, @params
 
       env = @project.environments.with_name('new').first!
-      env.should_not be_nil
-      env.deploys.count.should eql(1)
+      expect(env).not_to be_nil
+      expect(env.deploys.count).to eql(1)
     end
 
     it "should create a deploy with the given parameters" do
       @env.deploys.delete_all
       post :deploy, @params
 
-      @env.deploys.count.should eql(1)
-      @env.deploys(true).first.deployed_at.to_i.should eql(@time.to_i)
-      @env.deploys.first.revision.should eql(@rev)
-      @env.deploys.first.hostname.should eql('myhost.local')
+      expect(@env.deploys.count).to eql(1)
+      expect(@env.deploys(true).first.deployed_at.to_i).to eql(@time.to_i)
+      expect(@env.deploys.first.revision).to eql(@rev)
+      expect(@env.deploys.first.hostname).to eql('myhost.local')
     end
   end
 
-  describe "#symbolication", fdoc: '/symbolication' do
+  describe "#symbolication" do
     it "should return 422 if the symbolication param is not provided" do
       post :symbolication, format: 'json'
-      response.status.should eql(422)
+      expect(response.status).to eql(422)
     end
 
     it "should create a new symbolication" do
       Symbolication.delete_all
 
-      uuid = SecureRandom.uuid
+      uuid   = SecureRandom.uuid
       params = {
           'symbolications' => [
               'uuid'    => uuid,
@@ -147,16 +144,16 @@
 
       post :symbolication, params
 
-      response.status.should eql(201)
-      Symbolication.count.should eql(1)
-      Symbolication.first.uuid.should eql(uuid)
+      expect(response.status).to eql(201)
+      expect(Symbolication.count).to eql(1)
+      expect(Symbolication.first.uuid).to eql(uuid)
     end
   end
 
-  describe "#sourcemap", fdoc: '/sourcemap' do
+  describe "#sourcemap" do
     before :all do
-      Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-      @project = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      @project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
     end
 
     before :each do
@@ -166,43 +163,45 @@
           'sourcemap'   => @map.send(:read_attribute, :map),
           'api_key'     => @project.api_key,
           'environment' => @env.name,
-          'revision'    => (@rev = @project.repo.object('HEAD').sha)
+          'revision'    => (@rev = @project.repo.object('HEAD').sha),
+          'from'        => 'hosted',
+          'to'          => 'original'
       }
     end
 
     %w( sourcemap api_key environment revision ).each do |key|
       it "should require the #{key} key" do
         post :sourcemap, @params.merge(key => ' ')
-        response.status.should eql(422)
+        expect(response.status).to eql(422)
       end
     end
 
     it "should return 403 if the API key is invalid" do
       post :sourcemap, @params.merge('api_key' => 'not-found')
-      response.status.should eql(403)
+      expect(response.status).to eql(403)
     end
 
     it "should create a new environment if one doesn't exist with that name" do
       post :sourcemap, @params.merge('environment' => 'new')
 
       env = @project.environments.with_name('new').first!
-      env.should_not be_nil
-      env.source_maps.count.should eql(1)
+      expect(env).not_to be_nil
+      expect(env.source_maps.count).to eql(1)
     end
 
     it "should create a sourcemap with the given parameters" do
       @env.source_maps.delete_all
       post :sourcemap, @params
 
-      @env.source_maps.count.should eql(1)
-      @env.source_maps(true).first.revision.should eql(@rev)
+      expect(@env.source_maps.count).to eql(1)
+      expect(@env.source_maps(true).first.revision).to eql(@rev)
     end
   end
 
-  describe "#deobfuscation", fdoc: '/deobfuscation' do
+  describe "#deobfuscation" do
     before :all do
-      Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-      @project = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      @project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
     end
 
     before :each do
@@ -220,29 +219,29 @@
     %w( namespace api_key environment build ).each do |key|
       it "should require the #{key} key" do
         post :deobfuscation, @params.merge(key => ' ')
-        response.status.should eql(422)
+        expect(response.status).to eql(422)
       end
     end
 
     it "should return 403 if the API key is invalid" do
       post :deobfuscation, @params.merge('api_key' => 'not-found')
-      response.status.should eql(403)
+      expect(response.status).to eql(403)
     end
 
     it "should return 404 if the environment name is unknown" do
       post :deobfuscation, @params.merge('environment' => 'new')
-      response.status.should eql(404)
+      expect(response.status).to eql(404)
     end
 
     it "should return 404 if the build number is unknown" do
       post :deobfuscation, @params.merge('build' => 'nil')
-      response.status.should eql(404)
+      expect(response.status).to eql(404)
     end
 
     it "should create an obfuscation map with the given parameters" do
       post :deobfuscation, @params
 
-      @release.obfuscation_map(true).send(:read_attribute, :namespace).should eql(@ns.send(:read_attribute, :namespace))
+      expect(@release.obfuscation_map(true).send(:read_attribute, :namespace)).to eql(@ns.send(:read_attribute, :namespace))
     end
   end
 end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index f675a093..2468ed44 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,37 +12,37 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe ApplicationController do
+RSpec.describe ApplicationController do
   describe "#infinite_scroll_clause" do
     before :each do
-      @record = mock('Record', created_at: Time.at(12345890), id: 12345)
+      @record = double('Record', created_at: Time.at(12345890), id: 12345)
     end
 
     it "should return a proper WHERE clause for an ascending infinite scroll" do
-      ApplicationController.new.send(:infinite_scroll_clause, 'table.created_at', 'ASC', @record, 'table.id').
-        should eql(['table.created_at > ? OR (table.created_at = ? AND table.id > ?)', @record.created_at, @record.created_at, 12345])
+      expect(ApplicationController.new.send(:infinite_scroll_clause, 'table.created_at', 'ASC', @record, 'table.id')).
+        to eql(['table.created_at > ? OR (table.created_at = ? AND table.id > ?)', @record.created_at, @record.created_at, 12345])
     end
 
     it "should return a proper WHERE clause for a descending infinite scroll" do
-      ApplicationController.new.send(:infinite_scroll_clause, 'table.created_at', 'DESC', @record, 'table.id').
-        should eql(['table.created_at < ? OR (table.created_at = ? AND table.id < ?)', @record.created_at, @record.created_at, 12345])
+      expect(ApplicationController.new.send(:infinite_scroll_clause, 'table.created_at', 'DESC', @record, 'table.id')).
+        to eql(['table.created_at < ? OR (table.created_at = ? AND table.id < ?)', @record.created_at, @record.created_at, 12345])
     end
 
     it "should return a proper WHERE clause for an ascending infinite scroll with no fallback key" do
-      ApplicationController.new.send(:infinite_scroll_clause, 'table.id', 'ASC', @record).
-        should eql(['table.id > ?', @record.id])
+      expect(ApplicationController.new.send(:infinite_scroll_clause, 'table.id', 'ASC', @record)).
+        to eql(['table.id > ?', @record.id])
     end
 
     it "should return a proper WHERE clause for a descending infinite scroll with no fallback key" do
-      ApplicationController.new.send(:infinite_scroll_clause, 'table.id', 'DESC', @record).
-        should eql(['table.id < ?', @record.id])
+      expect(ApplicationController.new.send(:infinite_scroll_clause, 'table.id', 'DESC', @record)).
+        to eql(['table.id < ?', @record.id])
     end
 
     it "should return TRUE given bogus sort direction" do
-      ApplicationController.new.send(:infinite_scroll_clause, 'table.created_at', 'SIDEWAYS', @record, 'table.id').
-        should eql('TRUE')
+      expect(ApplicationController.new.send(:infinite_scroll_clause, 'table.created_at', 'SIDEWAYS', @record, 'table.id')).
+        to eql('TRUE')
     end
   end
 end
diff --git a/spec/controllers/bugs_controller_spec.rb b/spec/controllers/bugs_controller_spec.rb
index a4c34caa..4b387f97 100644
--- a/spec/controllers/bugs_controller_spec.rb
+++ b/spec/controllers/bugs_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,13 +12,11 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe BugsController do
+RSpec.describe BugsController, type: :controller do
   describe "#index" do
     before :all do
-      BugsController::PER_PAGE = 5 # speed it up
-
       membership = FactoryGirl.create(:membership)
       @env       = FactoryGirl.create(:environment, project: membership.project)
       @bugs      = 10.times.map do |i|
@@ -37,9 +35,11 @@
                                          first_occurrence:  Time.now - rand*86400,
                                          latest_occurrence: Time.now - rand*86400
       end
-      @bugs = @env.bugs(true).all # reload to get those fields set by triggers
+      @bugs = @env.bugs(true).to_a # reload to get those fields set by triggers
     end
 
+    before(:each) { stub_const 'BugsController::PER_PAGE', 5 } # speed it up
+
     def sort(bugs, field, reverse=false)
       bugs.sort_by! { |b| [b.send(field), b.number] }
       bugs.reverse! if reverse
@@ -48,7 +48,7 @@ def sort(bugs, field, reverse=false)
 
     it "should require a logged-in user" do
       get :index, polymorphic_params(@env, true)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -59,57 +59,57 @@ def sort(bugs, field, reverse=false)
       context '[JSON]' do
         it "should load 50 of the most recently occurring bugs by default" do
           get :index, polymorphic_params(@env, true, format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :latest_occurrence, true).map(&:number)[0, 5])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :latest_occurrence, true).map(&:number)[0, 5])
 
           get :index, polymorphic_params(@env, true, dir: 'asc', format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :latest_occurrence).map(&:number)[0, 5])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :latest_occurrence).map(&:number)[0, 5])
         end
 
         it "should also sort by first occurrence" do
           get :index, polymorphic_params(@env, true, sort: 'first', format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :first_occurrence).map(&:number)[0, 5])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :first_occurrence).map(&:number)[0, 5])
 
           get :index, polymorphic_params(@env, true, sort: 'first', dir: 'desc', format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :first_occurrence, true).map(&:number)[0, 5])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :first_occurrence, true).map(&:number)[0, 5])
         end
 
         it "should also sort by occurrence count" do
           get :index, polymorphic_params(@env, true, sort: 'occurrences', format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :occurrences_count, true).map(&:number)[0, 5])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :occurrences_count, true).map(&:number)[0, 5])
 
           get :index, polymorphic_params(@env, true, sort: 'occurrences', dir: 'asc', format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :occurrences_count).map(&:number)[0, 5])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :occurrences_count).map(&:number)[0, 5])
         end
 
         it "should return the next 50 bugs when given a last parameter" do
           sort @bugs, :latest_occurrence, true
           get :index, polymorphic_params(@env, true, last: @bugs[4].number, format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(@bugs.map(&:number)[5, 5])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@bugs.map(&:number)[5, 5])
         end
 
         it "should decorate the bug JSON" do
           get :index, polymorphic_params(@env, true, format: 'json')
-          JSON.parse(response.body).each { |bug| bug['href'].should eql(project_environment_bug_url(@env.project, @env, bug['number'])) }
+          JSON.parse(response.body).each { |bug| expect(bug['href']).to eql(project_environment_bug_url(@env.project, @env, bug['number'])) }
         end
 
         it "should filter by bug attributes" do
           get :index, polymorphic_params(@env, true, format: 'json', filter: {irrelevant: 'true'})
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :latest_occurrence, true).select(&:irrelevant).map(&:number)[0, 5])
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :latest_occurrence, true).select(&:irrelevant).map(&:number)[0, 5])
         end
 
         it "should treat deploy_id=nil as any deploy_id value" do
           deployed   = FactoryGirl.create(:bug, environment: @env, deploy: FactoryGirl.create(:deploy, environment: @env))
           undeployed = FactoryGirl.create(:bug, environment: @env, deploy: nil)
           get :index, polymorphic_params(@env, true, format: 'json', filter: {deploy_id: nil})
-          JSON.parse(response.body).map { |r| r['number'] }.should include(deployed.number)
-          JSON.parse(response.body).map { |r| r['number'] }.should include(undeployed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(deployed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(undeployed.number)
         end
 
         it "should treat crashed=nil as any crashed value" do
@@ -117,50 +117,50 @@ def sort(bugs, field, reverse=false)
           uncrashed = FactoryGirl.create(:bug, environment: @env, any_occurrence_crashed: false)
 
           get :index, polymorphic_params(@env, true, format: 'json', filter: {any_occurrence_crashed: nil})
-          JSON.parse(response.body).map { |r| r['number'] }.should include(crashed.number)
-          JSON.parse(response.body).map { |r| r['number'] }.should include(uncrashed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(crashed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(uncrashed.number)
 
           get :index, polymorphic_params(@env, true, format: 'json', filter: {any_occurrence_crashed: true})
-          JSON.parse(response.body).map { |r| r['number'] }.should include(crashed.number)
-          JSON.parse(response.body).map { |r| r['number'] }.should_not include(uncrashed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(crashed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).not_to include(uncrashed.number)
 
           get :index, polymorphic_params(@env, true, format: 'json', filter: {any_occurrence_crashed: false})
-          JSON.parse(response.body).map { |r| r['number'] }.should_not include(crashed.number)
-          JSON.parse(response.body).map { |r| r['number'] }.should include(uncrashed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).not_to include(crashed.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(uncrashed.number)
         end
 
         it "should treat assigned_user_id=anybody as all exceptions" do
           assigned   = FactoryGirl.create(:bug, environment: @env, assigned_user: @user)
           unassigned = FactoryGirl.create(:bug, environment: @env, assigned_user: nil)
           get :index, polymorphic_params(@env, true, format: 'json', filter: {assigned_user_id: 'anybody'})
-          JSON.parse(response.body).map { |r| r['number'] }.should include(assigned.number)
-          JSON.parse(response.body).map { |r| r['number'] }.should include(unassigned.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(assigned.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(unassigned.number)
         end
 
         it "should treat assigned_user_id=nobody as all unassigned bugs" do
           assigned   = FactoryGirl.create(:bug, environment: @env, assigned_user: @user)
           unassigned = FactoryGirl.create(:bug, environment: @env, assigned_user: nil)
           get :index, polymorphic_params(@env, true, format: 'json', filter: {assigned_user_id: 'nobody'})
-          JSON.parse(response.body).map { |r| r['number'] }.should_not include(assigned.number)
-          JSON.parse(response.body).map { |r| r['number'] }.should include(unassigned.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).not_to include(assigned.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(unassigned.number)
         end
 
         it "should treat assigned_user_id=somebody as any assigned user" do
           assigned   = FactoryGirl.create(:bug, environment: @env, assigned_user: @user)
           unassigned = FactoryGirl.create(:bug, environment: @env, assigned_user: nil)
           get :index, polymorphic_params(@env, true, format: 'json', filter: {assigned_user_id: 'somebody'})
-          JSON.parse(response.body).map { |r| r['number'] }.should include(assigned.number)
-          JSON.parse(response.body).map { |r| r['number'] }.should_not include(unassigned.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to include(assigned.number)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).not_to include(unassigned.number)
         end
 
         it "should filter by search query" do
           get :index, polymorphic_params(@env, true, format: 'json', filter: {search: 'even'})
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@bugs, :latest_occurrence, true).select { |b| b.message_template.include?('even') }.map(&:number)[0, 5])
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@bugs, :latest_occurrence, true).select { |b| b.message_template.include?('even') }.map(&:number)[0, 5])
         end
 
         it "should gracefully handle an invalid search query" do
           get :index, polymorphic_params(@env, true, format: 'json', filter: {search: 'A:Toaster'})
-          response.status.should eql(422)
+          expect(response.status).to eql(422)
         end
       end
     end
@@ -172,12 +172,12 @@ def sort(bugs, field, reverse=false)
       @project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
       @bug     = FactoryGirl.create(:bug, environment: FactoryGirl.create(:environment, project: @project))
       FactoryGirl.create :rails_occurrence, bug: @bug
-      repo = mock('Git::Repo')
+      repo = double('Git::Repo')
     end
 
     it "should require a logged-in user" do
       get :show, polymorphic_params(@bug, false)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -190,7 +190,7 @@ def sort(bugs, field, reverse=false)
         @bug.update_attribute :duplicate_of, dupe
 
         get :show, polymorphic_params(@bug, false)
-        assigns(:bug).duplicate_of_number.should eql(dupe.number)
+        expect(assigns(:bug).duplicate_of_number).to eql(dupe.number)
       end
     end
   end
@@ -199,85 +199,77 @@ def sort(bugs, field, reverse=false)
     before(:each) { @bug = FactoryGirl.create(:bug) }
 
     it "should require a logged-in user" do
-      put :update, polymorphic_params(@bug, false, bug: {fixed: 'true'})
-      response.should redirect_to(login_url(next: request.fullpath))
-      @bug.reload.should_not be_fixed
+      patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true'})
+      expect(response).to redirect_to(login_url(next: request.fullpath))
+      expect(@bug.reload).not_to be_fixed
     end
 
     context '[authenticated]' do
       before(:each) { login_as @bug.environment.project.owner }
 
-      it_should_behave_like "action that 404s at appropriate times", :put, :update, 'polymorphic_params(@bug, false, bug: { fixed: true })'
-      it_should_behave_like "singleton action that 404s at appropriate times", :put, :update, 'polymorphic_params(@bug, false, bug: { fixed: true })'
+      it_should_behave_like "action that 404s at appropriate times", :patch, :update, 'polymorphic_params(@bug, false, bug: { fixed: true })'
+      it_should_behave_like "singleton action that 404s at appropriate times", :patch, :update, 'polymorphic_params(@bug, false, bug: { fixed: true })'
 
       it "should update the bug" do
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, format: 'json')
-        @bug.reload.should be_fixed
-        response.body.should eql(@bug.to_json)
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, format: 'json')
+        expect(@bug.reload).to be_fixed
+        expect(response.body).to eql(@bug.to_json)
       end
 
       it "should set the bug modifier" do
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, format: 'json')
-        assigns(:bug).modifier.should eql(@bug.environment.project.owner)
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, format: 'json')
+        expect(assigns(:bug).modifier).to eql(@bug.environment.project.owner)
       end
 
       it "should add a comment if in the params" do
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, comment: {body: 'hai!'}, format: 'json')
-        @bug.reload.should be_fixed
-        @bug.comments.count.should eql(1)
-        @bug.comments.first.body.should eql('hai!')
-        @bug.comments.first.user_id.should eql(@bug.environment.project.owner_id)
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, comment: {body: 'hai!'}, format: 'json')
+        expect(@bug.reload).to be_fixed
+        expect(@bug.comments.count).to eql(1)
+        expect(@bug.comments.first.body).to eql('hai!')
+        expect(@bug.comments.first.user_id).to eql(@bug.environment.project.owner_id)
       end
 
       it "should not add a blank comment" do
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, comment: {body: '  '}, format: 'json')
-        @bug.reload.should be_fixed
-        @bug.comments.count.should eql(0)
-      end
-
-      it "should limit owners to only updating owner-accessible fields" do
-        pending "There are no owner-only fields on Bug"
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true'}, comment: {body: '  '}, format: 'json')
+        expect(@bug.reload).to be_fixed
+        expect(@bug.comments.count).to eql(0)
       end
 
-      it "should limit admins to only updating admin-accessible fields" do
-        pending "There are no admin-only fields on Bug"
-      end
-
-      it "should limit members to only updating member-accessible fields" do
-        pending "There are no owner-only or admin-only fields on Bug"
-      end
+      it "should limit owners to only updating owner-accessible fields"
+      it "should limit admins to only updating admin-accessible fields"
+      it "should limit members to only updating member-accessible fields"
 
       it "should set duplicate_of_id from duplicate_of_number" do
         other = FactoryGirl.create(:bug, environment: @bug.environment)
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: other.number}, format: 'json')
-        @bug.reload.duplicate_of_id.should eql(other.id)
-        @bug.should be_fixed
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: other.number}, format: 'json')
+        expect(@bug.reload.duplicate_of_id).to eql(other.id)
+        expect(@bug).to be_fixed
       end
 
       it "should copy errors of duplicate_of_id to duplicate_of_number" do
         FactoryGirl.create :bug, environment: @bug.environment, duplicate_of: @bug
         other = FactoryGirl.create(:bug, environment: @bug.environment)
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: other.number}, format: 'json')
-        response.status.should eql(422)
-        JSON.parse(response.body)['bug']['duplicate_of_number'].should eql(['cannot be marked as duplicate because other bugs have been marked as duplicates of this bug'])
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: other.number}, format: 'json')
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['bug']['duplicate_of_number']).to eql(['cannot be marked as duplicate because other bugs have been marked as duplicates of this bug'])
       end
 
       it "should add an error and not save the record if the duplicate-of number does not exist" do
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: 0}, format: 'json')
-        response.status.should eql(422)
-        JSON.parse(response.body)['bug']['duplicate_of_number'].should eql(['unknown bug number'])
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: 0}, format: 'json')
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['bug']['duplicate_of_number']).to eql(['unknown bug number'])
       end
 
       it "... unless no duplicate-of number was entered" do
-        put :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: ' '}, format: 'json')
-        response.status.should eql(200)
+        patch :update, polymorphic_params(@bug, false, bug: {fixed: 'true', duplicate_of_number: ' '}, format: 'json')
+        expect(response.status).to eql(200)
       end
 
       it "should allow the JIRA status to be nullified" do
         @bug.update_attribute :jira_status_id, 6
-        put :update, polymorphic_params(@bug, false, bug: {jira_status_id: ''}, format: 'json')
-        response.status.should eql(200)
-        @bug.reload.jira_status_id.should be_nil
+        patch :update, polymorphic_params(@bug, false, bug: {jira_status_id: ''}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@bug.reload.jira_status_id).to be_nil
       end
     end
   end
@@ -287,8 +279,8 @@ def sort(bugs, field, reverse=false)
 
     it "should require a logged-in user" do
       delete :destroy, polymorphic_params(@bug, false)
-      response.should redirect_to(login_url(next: request.fullpath))
-      -> { @bug.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect(response).to redirect_to(login_url(next: request.fullpath))
+      expect { @bug.reload }.not_to raise_error
     end
 
     context '[authenticated]' do
@@ -299,13 +291,13 @@ def sort(bugs, field, reverse=false)
 
       it "should destroy the bug" do
         delete :destroy, polymorphic_params(@bug, false)
-        -> { @bug.reload }.should raise_error(ActiveRecord::RecordNotFound)
+        expect { @bug.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
 
       it "should redirect with a notice" do
         delete :destroy, polymorphic_params(@bug, false)
-        response.should redirect_to(project_environment_bugs_url(@bug.environment.project, @bug.environment))
-        flash[:success].should include('was deleted')
+        expect(response).to redirect_to(project_environment_bugs_url(@bug.environment.project, @bug.environment))
+        expect(flash[:success]).to include('was deleted')
       end
     end
   end
@@ -314,25 +306,25 @@ def sort(bugs, field, reverse=false)
     before(:each) { @bug = FactoryGirl.create(:bug) }
 
     it "should require a logged-in user" do
-      post :watch, polymorphic_params(@bug, false)
-      response.should redirect_to(login_url(next: request.fullpath))
+      post :watch, polymorphic_params(@bug, false, format: 'json')
+      expect(response.status).to eql(401)
     end
 
     context '[authenticated]' do
       before(:each) { login_as(@user = @bug.environment.project.owner) }
 
-      it_should_behave_like "action that 404s at appropriate times", :post, :watch, 'polymorphic_params(@bug, false)'
-      it_should_behave_like "singleton action that 404s at appropriate times", :post, :watch, 'polymorphic_params(@bug, false)'
+      it_should_behave_like "action that 404s at appropriate times", :post, :watch, 'polymorphic_params(@bug, false, format: "json")'
+      it_should_behave_like "singleton action that 404s at appropriate times", :post, :watch, 'polymorphic_params(@bug, false, format: "json")'
 
       it "should watch an unwatched bug" do
-        post :watch, polymorphic_params(@bug, false)
-        @user.watches.where(bug_id: @bug.id).should_not be_empty
+        post :watch, polymorphic_params(@bug, false, format: 'json')
+        expect(@user.watches.where(bug_id: @bug.id)).not_to be_empty
       end
 
       it "should unwatch a watched bug" do
         FactoryGirl.create :watch, user: @user, bug: @bug
-        post :watch, polymorphic_params(@bug, false)
-        @user.watches.where(bug_id: @bug.id).should be_empty
+        post :watch, polymorphic_params(@bug, false, format: 'json')
+        expect(@user.watches.where(bug_id: @bug.id)).to be_empty
       end
     end
   end
@@ -341,26 +333,26 @@ def sort(bugs, field, reverse=false)
     before(:each) { @bug = FactoryGirl.create(:bug) }
 
     it "should require a logged-in user" do
-      post :notify_deploy, polymorphic_params(@bug, false)
-      response.should redirect_to(login_url(next: request.fullpath))
-      -> { @bug.reload }.should_not change(@bug, :notify_on_deploy)
+      post :notify_deploy, polymorphic_params(@bug, false, format: 'json')
+      expect(response.status).to eql(401)
+      expect { @bug.reload }.not_to change(@bug, :notify_on_deploy)
     end
 
     context '[authenticated]' do
       before(:each) { login_as(@user = @bug.environment.project.owner) }
 
-      it_should_behave_like "action that 404s at appropriate times", :post, :notify_deploy, 'polymorphic_params(@bug, false)'
-      it_should_behave_like "singleton action that 404s at appropriate times", :post, :notify_deploy, 'polymorphic_params(@bug, false)'
+      it_should_behave_like "action that 404s at appropriate times", :post, :notify_deploy, 'polymorphic_params(@bug, false, format: "json")'
+      it_should_behave_like "singleton action that 404s at appropriate times", :post, :notify_deploy, 'polymorphic_params(@bug, false, format: "json")'
 
       it "should add the current user to the deploy notifications list" do
-        post :notify_deploy, polymorphic_params(@bug, false)
-        @bug.reload.notify_on_deploy.should include(@user.id)
+        post :notify_deploy, polymorphic_params(@bug, false, format: 'json')
+        expect(@bug.reload.notify_on_deploy).to include(@user.id)
       end
 
       it "should remove the current user from the deploy notifications list" do
         @bug.update_attribute :notify_on_deploy, [@user.id]
-        post :notify_deploy, polymorphic_params(@bug, false)
-        @bug.reload.notify_on_deploy.should_not include(@user.id)
+        post :notify_deploy, polymorphic_params(@bug, false, format: 'json')
+        expect(@bug.reload.notify_on_deploy).not_to include(@user.id)
       end
     end
   end
@@ -369,26 +361,26 @@ def sort(bugs, field, reverse=false)
     before(:each) { @bug = FactoryGirl.create(:bug) }
 
     it "should require a logged-in user" do
-      post :notify_occurrence, polymorphic_params(@bug, false)
-      response.should redirect_to(login_url(next: request.fullpath))
-      -> { @bug.reload }.should_not change(@bug, :notify_on_occurrence)
+      post :notify_occurrence, polymorphic_params(@bug, false, format: 'json')
+      expect(response.status).to eql(401)
+      expect { @bug.reload }.not_to change(@bug, :notify_on_occurrence)
     end
 
     context '[authenticated]' do
       before(:each) { login_as(@user = @bug.environment.project.owner) }
 
-      it_should_behave_like "action that 404s at appropriate times", :post, :notify_occurrence, 'polymorphic_params(@bug, false)'
-      it_should_behave_like "singleton action that 404s at appropriate times", :post, :notify_occurrence, 'polymorphic_params(@bug, false)'
+      it_should_behave_like "action that 404s at appropriate times", :post, :notify_occurrence, 'polymorphic_params(@bug, false, format: "json")'
+      it_should_behave_like "singleton action that 404s at appropriate times", :post, :notify_occurrence, 'polymorphic_params(@bug, false, format: "json")'
 
       it "should add the current user to the occurrence notifications list" do
-        post :notify_occurrence, polymorphic_params(@bug, false)
-        @bug.reload.notify_on_occurrence.should include(@user.id)
+        post :notify_occurrence, polymorphic_params(@bug, false, format: 'json')
+        expect(@bug.reload.notify_on_occurrence).to include(@user.id)
       end
 
       it "should remove the current user from the occurrence notifications list" do
         @bug.update_attribute :notify_on_occurrence, [@user.id]
-        post :notify_occurrence, polymorphic_params(@bug, false)
-        @bug.reload.notify_on_occurrence.should_not include(@user.id)
+        post :notify_occurrence, polymorphic_params(@bug, false, format: 'json')
+        expect(@bug.reload.notify_on_occurrence).not_to include(@user.id)
       end
     end
   end
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index ff604162..a3195b95 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe CommentsController do
+RSpec.describe CommentsController, type: :controller do
   describe "#index" do
     before :all do
       membership = FactoryGirl.create(:membership)
@@ -28,7 +28,7 @@
 
     it "should require a logged-in user" do
       get :index, polymorphic_params(@bug, true)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -38,8 +38,8 @@
 
       it "should load the 50 most recent comments" do
         get :index, polymorphic_params(@bug, true, format: 'json')
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |r| r['number'] }.should eql(@comments.sort_by(&:created_at).reverse.map(&:number)[0, 50])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@comments.sort_by(&:created_at).reverse.map(&:number)[0, 50])
       end
 
       it "should return the next 50 comments when given a last parameter" do
@@ -47,17 +47,17 @@
         @comments.reverse!
 
         get :index, polymorphic_params(@bug, true, last: @comments[49].number, format: 'json')
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |r| r['number'] }.should eql(@comments.map(&:number)[50, 50])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@comments.map(&:number)[50, 50])
       end
 
       it "should decorate the response" do
         get :index, polymorphic_params(@bug, true, format: 'json')
         JSON.parse(response.body).zip(@comments.sort_by(&:created_at).reverse).each do |(hsh, comment)|
-          hsh['user']['username'].should eql(comment.user.username)
-          hsh['body_html'].should eql(ApplicationController.new.send(:markdown).(comment.body))
-          hsh['user_url'].should eql(user_url(comment.user))
-          hsh['url'].should eql(project_environment_bug_comment_url(@env.project, @env, @bug, comment, format: 'json'))
+          expect(hsh['user']['username']).to eql(comment.user.username)
+          expect(hsh['body_html']).to eql(ApplicationController.new.send(:markdown).(comment.body))
+          expect(hsh['user_url']).to eql(user_url(comment.user))
+          expect(hsh['url']).to eql(project_environment_bug_comment_url(@env.project, @env, @bug, comment, format: 'json'))
         end
       end
     end
@@ -73,8 +73,8 @@
 
     it "should require a logged-in user" do
       post :create, polymorphic_params(@bug, true, comment: {body: 'Hello, world!'})
-      response.should redirect_to(login_url(next: request.fullpath))
-      @bug.comments(true).should be_empty
+      expect(response).to redirect_to(login_url(next: request.fullpath))
+      expect(@bug.comments(true)).to be_empty
     end
 
     context '[authenticated]' do
@@ -84,21 +84,21 @@
 
       it "should create the comment" do
         post :create, polymorphic_params(@bug, true, comment: {body: 'Hello, world!'}, format: 'json')
-        response.status.should eql(201)
-        (comment = @bug.comments(true).first).should_not be_nil
-        response.body.should eql(comment.to_json)
+        expect(response.status).to eql(201)
+        expect(comment = @bug.comments(true).first).not_to be_nil
+        expect(response.body).to eql(comment.to_json)
       end
 
       it "should discard fields not accessible to creators" do
         @bug.comments.delete_all
-        post :create, polymorphic_params(@bug, true, comment: {user_id: FactoryGirl.create(:membership, project: @env.project).user_id, body: 'Hello, world!'})
-        @bug.comments(true).should be_empty
+        post :create, polymorphic_params(@bug, true, comment: {user_id: FactoryGirl.create(:membership, project: @env.project).user_id, body: 'Hello, world!'}, format: 'json')
+        expect(@bug.comments(true).first.user_id).to eql(@bug.environment.project.owner_id)
       end
 
       it "should render the errors with status 422 if invalid" do
         post :create, polymorphic_params(@bug, true, comment: {body: ''}, format: 'json')
-        response.status.should eql(422)
-        response.body.should eql("{\"comment\":{\"body\":[\"can’t be blank\"]}}")
+        expect(response.status).to eql(422)
+        expect(response.body).to eql("{\"comment\":{\"body\":[\"can’t be blank\"]}}")
       end
     end
   end
@@ -107,48 +107,48 @@
     before(:each) { @comment = FactoryGirl.create(:comment) }
 
     it "should require a logged-in user" do
-      put :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
-      response.status.should eql(401)
-      @comment.reload.body.should_not eql('Hello, world!')
+      patch :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
+      expect(response.status).to eql(401)
+      expect(@comment.reload.body).not_to eql('Hello, world!')
     end
 
     context '[authenticated]' do
       before(:each) { login_as @comment.user }
 
       it_should_behave_like "action that 404s at appropriate times", :get, :index, 'polymorphic_params(@comment, false)'
-      it_should_behave_like "singleton action that 404s at appropriate times", :put, :update, 'polymorphic_params(@comment, false, bug: { fixed: true })'
+      it_should_behave_like "singleton action that 404s at appropriate times", :patch, :update, 'polymorphic_params(@comment, false, bug: { fixed: true })'
 
       it "should update the comment" do
-        put :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
-        response.status.should eql(200)
-        @comment.reload.body.should eql('Hello, world!')
-        response.body.should eql(@comment.to_json)
+        patch :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@comment.reload.body).to eql('Hello, world!')
+        expect(response.body).to eql(@comment.to_json)
       end
 
       it "should allow admins to update any comment" do
         login_as FactoryGirl.create(:membership, project: @comment.bug.environment.project, admin: true).user
-        put :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
-        response.status.should eql(200)
-        @comment.reload.body.should eql('Hello, world!')
+        patch :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@comment.reload.body).to eql('Hello, world!')
       end
 
       it "should allow owners to update any comment" do
         login_as @comment.bug.environment.project.owner
-        put :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
-        response.status.should eql(200)
-        @comment.reload.body.should eql('Hello, world!')
+        patch :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@comment.reload.body).to eql('Hello, world!')
       end
 
       it "should not allow other members to update any comment" do
         login_as FactoryGirl.create(:membership, project: @comment.bug.environment.project, admin: false).user
-        put :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
-        response.status.should eql(403)
-        @comment.reload.body.should_not eql('Hello, world!')
+        patch :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!'}, format: 'json')
+        expect(response.status).to eql(403)
+        expect(@comment.reload.body).not_to eql('Hello, world!')
       end
 
       it "should not allow inaccessible fields to be updated" do
-        put :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!', number: 123})
-        @comment.reload.number.should_not eql(123)
+        patch :update, polymorphic_params(@comment, false, comment: {body: 'Hello, world!', number: 123}, format: 'json')
+        expect(@comment.reload.number).not_to eql(123)
       end
     end
   end
@@ -158,20 +158,20 @@
 
     it "should require a logged-in user" do
       delete :destroy, polymorphic_params(@comment, false, format: 'json')
-      response.status.should eql(401)
-      -> { @comment.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect(response.status).to eql(401)
+      expect { @comment.reload }.not_to raise_error
     end
 
     context '[authenticated]' do
       before(:each) { login_as @comment.user }
 
-      it_should_behave_like "action that 404s at appropriate times", :delete, :destroy, 'polymorphic_params(@comment, false)'
-      it_should_behave_like "singleton action that 404s at appropriate times", :delete, :destroy, 'polymorphic_params(@comment, false, bug: { fixed: true })'
+      it_should_behave_like "action that 404s at appropriate times", :delete, :destroy, 'polymorphic_params(@comment, false, format: "json")'
+      it_should_behave_like "singleton action that 404s at appropriate times", :delete, :destroy, 'polymorphic_params(@comment, false, bug: { fixed: true }, format: "json")'
 
       it "should destroy the comment" do
         delete :destroy, polymorphic_params(@comment, false)
-        response.status.should eql(204)
-        -> { @comment.reload }.should raise_error(ActiveRecord::RecordNotFound)
+        expect(response.status).to eql(204)
+        expect { @comment.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
diff --git a/spec/controllers/commits_controller_spec.rb b/spec/controllers/commits_controller_spec.rb
new file mode 100644
index 00000000..ef4ce96f
--- /dev/null
+++ b/spec/controllers/commits_controller_spec.rb
@@ -0,0 +1,208 @@
+# encoding: utf-8
+
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+require 'rails_helper'
+
+RSpec.describe CommitsController, type: :controller do
+  describe '#index' do
+    before :all do
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      @project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
+    end
+
+    it "should require a logged-in user" do
+      get :index, project_id: @project.to_param, format: 'json'
+      expect(response.status).to eql(401)
+    end
+
+    context '[authenticated]' do
+      before(:each) { login_as @project.owner }
+
+      it "should return the 10 most recent commits" do
+        get :index, project_id: @project.to_param, format: 'json'
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).size).to eql(10)
+      end
+    end
+  end
+
+  describe "#context" do
+    before :all do
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      @project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
+    end
+    before(:each) { @valid_params = {project_id: @project.to_param, id: '30e7c2ff8758f4f19bfbc0a57e26c19ab69d1d44', file: 'lib/better_caller/extensions.rb', line: 7, format: 'json'} }
+
+    it "should require a logged-in user" do
+      get :context, @valid_params
+      expect(response.status).to eql(401)
+    end
+
+    context '[authenticated]' do
+      before(:each) { login_as @project.owner }
+
+      it "should return an error if the project has no repository" do
+        project = FactoryGirl.create(:project, owner: @project.owner, repository_url: 'git@github.com:RISCfuture/doesnt-exist.git')
+        get :context, @valid_params.merge(project_id: project.to_param)
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['error']).to include('repository')
+      end
+
+      it "should return an error if the file param is missing" do
+        get :context, @valid_params.merge(file: nil)
+        expect(response.status).to eql(400)
+        expect(JSON.parse(response.body)['error']).to include('Missing')
+      end
+
+      it "should return an error if the line param is missing" do
+        get :context, @valid_params.merge(line: nil)
+        expect(response.status).to eql(400)
+        expect(JSON.parse(response.body)['error']).to include('Missing')
+      end
+
+      it "should return an error if the line param is less than 1" do
+        get :context, @valid_params.merge(line: 0)
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['error']).to include('out of range')
+      end
+
+      it "should return an error if the line param is greater than the number of lines in the file" do
+        get :context, @valid_params.merge(line: 15)
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['error']).to include('out of range')
+      end
+
+      it "should use 3 lines of context by default" do
+        get :context, @valid_params
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['code']).to eql(<<-TEXT.chomp)
+  def set_better_backtrace(bt)
+    @better_backtrace = bt.collect do |(file, line, meth, bind)|
+      vars = {
+        local_variables: eval("local_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+        instance_variables: eval("instance_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+        global_variables: eval("global_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+      }
+        TEXT
+      end
+
+      it "should use 3 lines context if an invalid value for the context param is given" do
+        get :context, @valid_params.merge(context: -1)
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['code']).to eql(<<-TEXT.chomp)
+  def set_better_backtrace(bt)
+    @better_backtrace = bt.collect do |(file, line, meth, bind)|
+      vars = {
+        local_variables: eval("local_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+        instance_variables: eval("instance_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+        global_variables: eval("global_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+      }
+        TEXT
+      end
+
+      it "should use a custom number of lines of context" do
+        get :context, @valid_params.merge(context: 2)
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['code']).to eql(<<-TEXT.chomp)
+    @better_backtrace = bt.collect do |(file, line, meth, bind)|
+      vars = {
+        local_variables: eval("local_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+        instance_variables: eval("instance_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+        global_variables: eval("global_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
+        TEXT
+      end
+
+      it "should clamp the context at the top of the file" do
+        get :context, @valid_params.merge(line: 1)
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['code']).to eql(<<-TEXT.chomp)
+# @private
+class Exception
+  # @private
+  def set_better_backtrace(bt)
+        TEXT
+      end
+
+      it "should clamp the context at the bottom of the file" do
+        get :context, @valid_params.merge(line: 14)
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['code']).to eql(<<-TEXT.chomp)
+      [ file, line, meth, vars]
+    end
+  end
+end
+        TEXT
+      end
+
+      it "should return an error given a nonexistent path" do
+        get :context, @valid_params.merge(file: 'foo/bar.rb')
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['error']).to include('Couldn’t find that commit')
+      end
+
+      it "should update the repo given an unknown revision" do
+        allow(Project).to receive(:find_from_slug!).and_return(@project)
+        expect(@project.repo).to receive(:fetch).once
+
+        get :context, @valid_params.merge(id: '39aacf78b603ade2034e93b9b12420b350dfa151') # unknown revision
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['error']).to include('Couldn’t find that commit')
+      end
+
+      it "should return an error given a nonexistent file" do
+        get :context, @valid_params.merge(file: 'lib/foo.rb')
+        expect(response.status).to eql(422)
+        expect(JSON.parse(response.body)['error']).to include('Couldn’t find that commit')
+      end
+
+      it "should pick an appropriate brush" do
+        get :context, @valid_params
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['brush']).to eql('ruby')
+
+        get :context, @valid_params.merge(file: 'Rakefile')
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['brush']).to eql('ruby')
+
+        get :context, @valid_params.merge(file: 'ext/better_caller.c')
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['brush']).to eql('cpp')
+      end
+
+      it "should return a correct first_line value" do
+        get :context, @valid_params
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)['first_line']).to eql(4)
+      end
+
+      it "should reject blank lines from the top of the snippet" do
+        get :context, @valid_params.merge(file: 'LICENSE.txt', line: 5)
+        expect(response.status).to eql(200)
+        rsp = JSON.parse(response.body)
+        expect(rsp['first_line']).to eql(3)
+        expect(rsp['code']).to eql(<<-TEXT.chomp)
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+        TEXT
+      end
+    end
+  end
+end
diff --git a/spec/controllers/emails_controller_spec.rb b/spec/controllers/emails_controller_spec.rb
index 09c61a05..46fde662 100644
--- a/spec/controllers/emails_controller_spec.rb
+++ b/spec/controllers/emails_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,19 +12,19 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe EmailsController do
+RSpec.describe EmailsController, type: :controller do
   describe "#index" do
-    before :all do
+    before :each do
       @user   = FactoryGirl.create(:user)
       @emails = FactoryGirl.create_list(:email, 11, user: @user)
     end
 
     it "should require a logged in user" do
       get :index, format: 'json'
-      response.status.should eql(401)
-      response.body.should be_blank
+      expect(response.status).to eql(401)
+      expect(response.body).to be_blank
     end
 
     context "[authenticated]" do
@@ -32,8 +32,8 @@
 
       it "should load the first 10 emails" do
         get :index, format: 'json'
-        response.status.should eql(200)
-        response.body.should eql(@emails.sort_by(&:email)[0, 10].map { |e| e.as_json.merge(url: account_email_url(e)) }.to_json)
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(@emails.sort_by(&:email)[0, 10].map { |e| e.as_json.merge(url: account_email_url(e)) }.to_json)
       end
 
       it "should filter emails given a query" do
@@ -41,21 +41,21 @@
         filter2 = FactoryGirl.create(:email, user: @user, email: 'filter2@example.com')
 
         get :index, format: 'json', query: 'filter'
-        response.status.should eql(200)
-        response.body.should eql([filter1, filter2].map { |e| e.as_json.merge(url: account_email_url(e)) }.to_json)
+        expect(response.status).to eql(200)
+        expect(response.body).to eql([filter1, filter2].map { |e| e.as_json.merge(url: account_email_url(e)) }.to_json)
       end
 
       it "should not include primary emails" do
         @user.emails.redirected.delete_all
         get :index, format: 'json'
-        response.status.should eql(200)
-        response.body.should eql('[]')
+        expect(response.status).to eql(200)
+        expect(response.body).to eql('[]')
       end
 
       it "should not include project-specific emails if project_id is not set" do
         email = FactoryGirl.create(:email, user: @user, project: FactoryGirl.create(:membership, user: @user).project)
         get :index, format: 'json'
-        JSON.parse(response.body).map { |e| e['email'] }.should_not include(email.email)
+        expect(JSON.parse(response.body).map { |e| e['email'] }).not_to include(email.email)
       end
 
       it "should only include project-specific emails if project_id is set" do
@@ -63,7 +63,7 @@
         email1  = FactoryGirl.create(:email, user: @user, project: project)
         FactoryGirl.create :email, user: @user, project: FactoryGirl.create(:membership, user: @user).project
         get :index, project_id: project.to_param, format: 'json'
-        JSON.parse(response.body).map { |e| e['email'] }.should eql([email1.email])
+        expect(JSON.parse(response.body).map { |e| e['email'] }).to eql([email1.email])
       end
     end
   end
@@ -73,9 +73,9 @@
     before(:each) { @user.emails.redirected.delete_all }
 
     it "should require a logged in user" do
-      -> { post :create, format: 'json', email: {email: 'foo@bar.com'} }.should_not change(Email, :count)
-      response.status.should eql(401)
-      response.body.should be_blank
+      expect { post :create, format: 'json', email: {email: 'foo@bar.com'} }.not_to change(Email, :count)
+      expect(response.status).to eql(401)
+      expect(response.body).to be_blank
     end
 
     context "[authenticated]" do
@@ -83,31 +83,30 @@
 
       it "should create a new redirected email" do
         post :create, format: 'json', email: {email: 'new@example.com'}
-        response.status.should eql(201)
-        @user.emails.redirected.count.should eql(1)
-        @user.emails.redirected.first.email.should eql('new@example.com')
-        response.body.should eql(@user.emails.redirected.first.to_json)
+        expect(response.status).to eql(201)
+        expect(@user.emails.redirected.count).to eql(1)
+        expect(@user.emails.redirected.first.email).to eql('new@example.com')
+        expect(response.body).to eql(@user.emails.redirected.first.to_json)
       end
 
       it "should not allow a primary email to be created" do
         post :create, format: 'json', email: {email: 'new@example.com', primary: '1'}
-        response.status.should eql(400)
-        @user.emails.count.should eql(1)
+        expect(@user.emails.find_by_email('new@example.com')).not_to be_primary
       end
 
       it "should handle validation errors" do
         post :create, format: 'json', email: {email: 'not an email'}
-        response.status.should eql(422)
-        response.body.should eql({email: {email: ['not a valid email address']}}.to_json)
-        @user.emails.redirected.count.should be_zero
+        expect(response.status).to eql(422)
+        expect(response.body).to eql({email: {email: ['not a valid email address']}}.to_json)
+        expect(@user.emails.redirected.count).to be_zero
       end
 
       it "should set project_id if given" do
         @user.emails.redirected.delete_all
         project = FactoryGirl.create(:membership, user: @user).project
         post :create, project_id: project.to_param, format: 'json', email: {email: 'new2@example.com'}
-        response.status.should eql(201)
-        @user.emails.redirected.first.project_id.should eql(project.id)
+        expect(response.status).to eql(201)
+        expect(@user.emails.redirected.first.project_id).to eql(project.id)
       end
     end
   end
@@ -121,9 +120,9 @@
     end
 
     it "should require a logged in user" do
-      -> { delete :destroy, id: @email.to_param, format: 'json' }.should_not change(Email, :count)
-      response.status.should eql(401)
-      response.body.should be_blank
+      expect { delete :destroy, id: @email.to_param, format: 'json' }.not_to change(Email, :count)
+      expect(response.status).to eql(401)
+      expect(response.body).to be_blank
     end
 
     context "[authenticated]" do
@@ -131,19 +130,19 @@
 
       it "should 404 given an unknown email" do
         delete :destroy, id: 'unknown@email.com', format: 'json'
-        response.status.should eql(404)
+        expect(response.status).to eql(404)
       end
 
       it "should not allow a primary email to be deleted" do
         delete :destroy, id: @user.email, format: 'json'
-        response.status.should eql(404)
-        @user.emails.count.should eql(2)
+        expect(response.status).to eql(404)
+        expect(@user.emails.count).to eql(2)
       end
 
       it "should delete a redirected email" do
         delete :destroy, id: @email.to_param, format: 'json'
-        response.status.should eql(204)
-        @user.emails.redirected.count.should be_zero
+        expect(response.status).to eql(204)
+        expect(@user.emails.redirected.count).to be_zero
       end
     end
   end
diff --git a/spec/controllers/environments_controller_spec.rb b/spec/controllers/environments_controller_spec.rb
index 1996a663..68316b8a 100644
--- a/spec/controllers/environments_controller_spec.rb
+++ b/spec/controllers/environments_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,16 +12,16 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe EnvironmentsController do
+RSpec.describe EnvironmentsController, type: :controller do
   describe "#update" do
     before(:each) { @environment = FactoryGirl.create(:environment, sends_emails: true) }
 
     it "should require a logged-in user" do
-      put :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
-      response.status.should eql(401)
-      @environment.reload.sends_emails?.should be_true
+      patch :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
+      expect(response.status).to eql(401)
+      expect(@environment.reload.sends_emails?).to eql(true)
     end
 
     context '[authenticated]' do
@@ -31,28 +31,28 @@
         user = FactoryGirl.create(:membership, project: @environment.project, admin: true).user
         login_as user
 
-        put :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
-        response.status.should eql(200)
-        @environment.reload.sends_emails?.should be_false
+        patch :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@environment.reload.sends_emails?).to eql(false)
       end
 
       it "should not allow members to alter the environment" do
         login_as FactoryGirl.create(:membership, project: @environment.project, admin: false).user
-        put :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
-        response.status.should eql(403)
-        @environment.reload.sends_emails?.should be_true
+        patch :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
+        expect(response.status).to eql(403)
+        expect(@environment.reload.sends_emails?).to eql(true)
       end
 
       it "should allow owners to alter the environment" do
-        put :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
-        response.status.should eql(200)
-        @environment.reload.sends_emails?.should be_false
-        response.body.should eql(@environment.to_json)
+        patch :update, polymorphic_params(@environment, false, environment: {sends_emails: false}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@environment.reload.sends_emails?).to eql(false)
+        expect(response.body).to eql(@environment.to_json)
       end
 
       it "should not allow protected fields to be set" do
-        -> { put :update, polymorphic_params(@environment, false, environment: {bugs_count: 128}, format: 'json') }.should_not change(@environment, :bugs_count)
-        response.status.should eql(400)
+        expect { patch :update, polymorphic_params(@environment, false, environment: {bugs_count: 128}, format: 'json') }.not_to change(@environment, :bugs_count)
+        expect { @environment.reload }.not_to change(@environment, :bugs_count)
       end
     end
   end
diff --git a/spec/controllers/events_controller_spec.rb b/spec/controllers/events_controller_spec.rb
index 985f3d97..d554c46e 100644
--- a/spec/controllers/events_controller_spec.rb
+++ b/spec/controllers/events_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe EventsController do
+RSpec.describe EventsController, type: :controller do
   include EventDecoration
 
   describe "#index" do
@@ -36,7 +36,7 @@
 
     it "should require a logged-in user" do
       get :index, polymorphic_params(@bug, true)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -46,8 +46,8 @@
 
       it "should load the 50 most recent events" do
         get :index, polymorphic_params(@bug, true, format: 'json')
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |e| e['kind'] }.should eql(@events.sort_by(&:created_at).reverse.map(&:kind)[0, 50])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |e| e['kind'] }).to eql(@events.sort_by(&:created_at).reverse.map(&:kind)[0, 50])
       end
 
       it "should return the next 50 events when given a last parameter" do
@@ -55,21 +55,21 @@
         @events.reverse!
 
         get :index, polymorphic_params(@bug, true, last: @events[49].id, format: 'json')
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |e| e['kind'] }.should eql(@events.map(&:kind)[50, 50])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |e| e['kind'] }).to eql(@events.map(&:kind)[50, 50])
       end
 
       it "should decorate the response" do
         get :index, polymorphic_params(@bug, true, format: 'json')
         JSON.parse(response.body).zip(@events.sort_by(&:created_at).reverse).each do |(hsh, event)|
-          hsh['icon'].should include(icon_for_event(event))
-          hsh['user_url'].should eql(user_url(event.user))
-          hsh['assignee_url'].should eql(user_url(event.assignee))
-          hsh['occurrence_url'].should eql(project_environment_bug_occurrence_url(@env.project, @env, @bug, event.occurrence))
-          hsh['comment_body'].should eql(ApplicationController.new.send(:markdown).(event.comment.body))
-          hsh['resolution_url'].should eql(@bug.resolution_revision)
-          hsh['assignee_you'].should eql(event.assignee == @user)
-          hsh['user_you'].should eql(@user == event.user)
+          expect(hsh['icon']).to include(icon_for_event(event))
+          expect(hsh['user_url']).to eql(user_url(event.user))
+          expect(hsh['assignee_url']).to eql(user_url(event.assignee))
+          expect(hsh['occurrence_url']).to eql(project_environment_bug_occurrence_url(@env.project, @env, @bug, event.occurrence))
+          expect(hsh['comment_body']).to eql(ApplicationController.new.send(:markdown).(event.comment.body))
+          expect(hsh['resolution_url']).to eql(@bug.resolution_revision)
+          expect(hsh['assignee_you']).to eql(event.assignee == @user)
+          expect(hsh['user_you']).to eql(@user == event.user)
         end
       end
 
@@ -81,9 +81,9 @@
         get :index, polymorphic_params(dupe, true, format: 'json')
 
         json = JSON.parse(response.body)
-        json.first['kind'].should eql('dupe')
-        json.first['original_url'].should eql(project_environment_bug_url(original.environment.project, original.environment, original))
-        json.first['original']['number'].should eql(original.number)
+        expect(json.first['kind']).to eql('dupe')
+        expect(json.first['original_url']).to eql(project_environment_bug_url(original.environment.project, original.environment, original))
+        expect(json.first['original']['number']).to eql(original.number)
       end
     end
   end
diff --git a/spec/controllers/jira/issues_controller_spec.rb b/spec/controllers/jira/issues_controller_spec.rb
index cae4646c..9899ad91 100644
--- a/spec/controllers/jira/issues_controller_spec.rb
+++ b/spec/controllers/jira/issues_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Jira::IssuesController do
+RSpec.describe Jira::IssuesController, type: :controller do
   describe "#show" do
     it "should return information about a JIRA issue" do
       FakeWeb.register_uri :get,
@@ -22,9 +22,9 @@
                            response: Rails.root.join('spec', 'fixtures', 'jira_issue.json')
 
       get :show, id: 'FOO-123', format: 'json'
-      response.status.should eql(200)
+      expect(response.status).to eql(200)
       body = JSON.parse(response.body)
-      body['fields']['summary'].should eql("Double RTs on coffee bar Twitter monitor")
+      expect(body['fields']['summary']).to eql("Double RTs on coffee bar Twitter monitor")
     end
 
     it "should 404 if the JIRA issue is not found" do
@@ -33,7 +33,7 @@
                            response: Rails.root.join('spec', 'fixtures', 'jira_issue_404.json')
 
       get :show, id: 'FOO-124', format: 'json'
-      response.status.should eql(404)
+      expect(response.status).to eql(404)
     end
   end
 end unless Squash::Configuration.jira.disabled?
diff --git a/spec/controllers/jira/projects_controller_spec.rb b/spec/controllers/jira/projects_controller_spec.rb
index 85a261dc..36082a19 100644
--- a/spec/controllers/jira/projects_controller_spec.rb
+++ b/spec/controllers/jira/projects_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Jira::ProjectsController do
+RSpec.describe Jira::ProjectsController, type: :controller do
   describe "#index" do
     it "should a list of known projects" do
       FakeWeb.register_uri :get,
@@ -22,10 +22,10 @@
                            response: Rails.root.join('spec', 'fixtures', 'jira_projects.json')
 
       get :index, format: 'json'
-      response.status.should eql(200)
+      expect(response.status).to eql(200)
       body = JSON.parse(response.body)
-      body.map { |st| st['name'] }.
-          should eql(["Alert", "Android", "Bugs", "Business Intelligence",
+      expect(body.map { |st| st['name'] }).
+          to eql(["Alert", "Android", "Bugs", "Business Intelligence",
                       "Checker", "Coffee Bar", "Compliance"].sort)
     end
   end
diff --git a/spec/controllers/jira/statuses_controller_spec.rb b/spec/controllers/jira/statuses_controller_spec.rb
index 82d05251..ec716048 100644
--- a/spec/controllers/jira/statuses_controller_spec.rb
+++ b/spec/controllers/jira/statuses_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Jira::StatusesController do
+RSpec.describe Jira::StatusesController, type: :controller do
   describe "#index" do
     it "should a list of known statuses" do
       FakeWeb.register_uri :get,
@@ -22,10 +22,10 @@
                            response: Rails.root.join('spec', 'fixtures', 'jira_statuses.json')
 
       get :index, format: 'json'
-      response.status.should eql(200)
+      expect(response.status).to eql(200)
       body = JSON.parse(response.body)
-      body.map { |st| st['name'] }.
-          should eql(["Open", "In Progress", "Reopened", "Resolved", "Closed",
+      expect(body.map { |st| st['name'] }).
+          to eql(["Open", "In Progress", "Reopened", "Resolved", "Closed",
                       "Needs Review", "Approved", "Hold Pending Info", "IceBox",
                       "Not Yet Started", "Started", "Finished", "Delivered",
                       "Accepted", "Rejected", "Allocated", "Build", "Verify",
diff --git a/spec/controllers/notification_thresholds_controller_spec.rb b/spec/controllers/notification_thresholds_controller_spec.rb
index cef13583..bebd5128 100644
--- a/spec/controllers/notification_thresholds_controller_spec.rb
+++ b/spec/controllers/notification_thresholds_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,10 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe NotificationThresholdsController do
-  {create: :post, update: :put}.each do |action, method|
+RSpec.describe NotificationThresholdsController, type: :controller do
+  {create: :post, update: :patch}.each do |action, method|
     before :all do
       @env    = FactoryGirl.create(:environment)
       @params = {notification_threshold: {period: 3600, threshold: 500}}
@@ -24,9 +24,9 @@
 
     describe "##{action}" do
       it "should require a logged-in user" do
-        send method, action, polymorphic_params(@bug, true, @params)
-        response.should redirect_to(login_url(next: request.fullpath))
-        @bug.notification_thresholds.count.should eql(0)
+        send method, action, polymorphic_params(@bug, true, @params.merge(format: 'json'))
+        expect(response.status).to eql(401)
+        expect(@bug.notification_thresholds.count).to eql(0)
       end
 
       context '[authenticated]' do
@@ -36,30 +36,30 @@
 
         it "should create a new notification" do
           @bug.notification_thresholds.delete_all
-          send method, action, polymorphic_params(@bug, true, @params)
+          send method, action, polymorphic_params(@bug, true, @params.merge(format: 'json'))
 
-          @bug.notification_thresholds.count.should eql(1)
-          @bug.notification_thresholds(true).first.period.should eql(3600)
-          @bug.notification_thresholds.first.threshold.should eql(500)
-          @bug.notification_thresholds.first.user_id.should eql(@bug.environment.project.owner_id)
+          expect(@bug.notification_thresholds.count).to eql(1)
+          expect(@bug.notification_thresholds(true).first.period).to eql(3600)
+          expect(@bug.notification_thresholds.first.threshold).to eql(500)
+          expect(@bug.notification_thresholds.first.user_id).to eql(@bug.environment.project.owner_id)
         end
 
         it "should update an existing notification" do
           @bug.notification_thresholds.delete_all
           FactoryGirl.create :notification_threshold, user: @bug.environment.project.owner, bug: @bug, period: 36, threshold: 5
-          send method, action, polymorphic_params(@bug, true, @params)
+          send method, action, polymorphic_params(@bug, true, @params.merge(format: 'json'))
 
-          @bug.notification_thresholds.count.should eql(1)
-          @bug.notification_thresholds(true).first.period.should eql(3600)
-          @bug.notification_thresholds.first.threshold.should eql(500)
-          @bug.notification_thresholds.first.user_id.should eql(@bug.environment.project.owner_id)
+          expect(@bug.notification_thresholds.count).to eql(1)
+          expect(@bug.notification_thresholds(true).first.period).to eql(3600)
+          expect(@bug.notification_thresholds.first.threshold).to eql(500)
+          expect(@bug.notification_thresholds.first.user_id).to eql(@bug.environment.project.owner_id)
         end
 
         it "should not allow user or bug ID to be changed" do
           @bug.notification_thresholds.delete_all
           send method, action, polymorphic_params(@bug, true, notification_threshold: {user_id: 1, bug_id: 1, period: 1, threshold: 2}, format: 'json')
-          response.status.should eql(400)
-          @bug.notification_thresholds.count.should eql(0)
+          expect(@bug.notification_thresholds.count).to eql(1)
+          expect(@bug.notification_thresholds(true).first.user_id).to eql(@bug.environment.project.owner_id)
         end
       end
     end
@@ -71,8 +71,8 @@
 
     it "should require a logged-in user" do
       delete :destroy, polymorphic_params(@bug, true)
-      response.should redirect_to(login_url(next: request.fullpath))
-      @bug.reload.should_not be_fixed
+      expect(response).to redirect_to(login_url(next: request.fullpath))
+      expect(@bug.reload).not_to be_fixed
     end
 
     context '[authenticated]' do
@@ -81,14 +81,14 @@
       it "should delete a notification threshold" do
         FactoryGirl.create :notification_threshold, user: @bug.environment.project.owner, bug: @bug, period: 36, threshold: 5
         delete :destroy, polymorphic_params(@bug, true)
-        response.should redirect_to(project_environment_bug_url(@bug.environment.project, @bug.environment, @bug, anchor: 'notifications'))
-        @bug.notification_thresholds.count.should eql(0)
+        expect(response).to redirect_to(project_environment_bug_url(@bug.environment.project, @bug.environment, @bug, anchor: 'notifications'))
+        expect(@bug.notification_thresholds.count).to eql(0)
       end
 
       it "should do nothing if no notification threshold exists" do
         delete :destroy, polymorphic_params(@bug, true)
-        response.should redirect_to(project_environment_bug_url(@bug.environment.project, @bug.environment, @bug, anchor: 'notifications'))
-        @bug.notification_thresholds.count.should eql(0)
+        expect(response).to redirect_to(project_environment_bug_url(@bug.environment.project, @bug.environment, @bug, anchor: 'notifications'))
+        expect(@bug.notification_thresholds.count).to eql(0)
       end
     end
   end
diff --git a/spec/controllers/occurrences_controller_spec.rb b/spec/controllers/occurrences_controller_spec.rb
index 9582f29b..ff78805b 100644
--- a/spec/controllers/occurrences_controller_spec.rb
+++ b/spec/controllers/occurrences_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe OccurrencesController do
+RSpec.describe OccurrencesController, type: :controller do
   describe "#index" do
     before :all do
       @bug         = FactoryGirl.create(:bug)
@@ -29,7 +29,7 @@ def sort(occurrences, reverse=false)
 
     it "should require a logged-in user" do
       get :index, polymorphic_params(@bug, true)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -40,21 +40,21 @@ def sort(occurrences, reverse=false)
       context '[JSON]' do
         it "should load the first 50 occurrences" do
           get :index, polymorphic_params(@bug, true, format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@occurrences, true).map(&:number)[0, 50])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@occurrences, true).map(&:number)[0, 50])
         end
 
         it "should load the first 50 occurrences ascending" do
           get :index, polymorphic_params(@bug, true, format: 'json', dir: 'asc')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(sort(@occurrences).map(&:number)[0, 50])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(sort(@occurrences).map(&:number)[0, 50])
         end
 
         it "should load the next 50 occurrences" do
           sort @occurrences, true
           get :index, polymorphic_params(@bug, true, format: 'json', last: @occurrences[49].number)
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['number'] }.should eql(@occurrences.map(&:number)[50, 50])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['number'] }).to eql(@occurrences.map(&:number)[50, 50])
         end
       end
     end
@@ -68,7 +68,7 @@ def sort(occurrences, reverse=false)
 
     it "should require a logged-in user" do
       get :histogram, polymorphic_params(@bug, true)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -81,26 +81,26 @@ def sort(occurrences, reverse=false)
 
       before :each do
         login_as @bug.environment.project.owner
-        Time.stub!(:now).and_return(Time.at(1234567890)) # make sure we don't get boundary errors
+        allow(Time).to receive(:now).and_return(Time.at(1234567890)) # make sure we don't get boundary errors
       end
 
       it_should_behave_like "action that 404s at appropriate times", :get, :histogram, "polymorphic_params(@bug, true, dimensions: %w( host pid ), step: 1000*60*60*5, size: 20, format: 'json')"
 
       it "should return a histogram of occurrence frequencies and deploys" do
         get :histogram, polymorphic_params(@bug, true, dimensions: %w( host pid ), step: 1000*60*60*5, size: 20, format: 'json')
-        response.status.should eql(200)
+        expect(response.status).to eql(200)
         json = JSON.parse(response.body)
-        json['occurrences'].should eql([
+        expect(json['occurrences']).to eql([
                                                                 [1234544400000, 1], [1234548000000, 5], [1234551600000, 4], [1234555200000, 5], [1234558800000, 4], [1234562400000, 5], [1234566000000, 3]
                                                             ])
-        json['deploys'].map { |d| d['revision'] }.should eql(%w(30e7c2ff8758f4f19bfbc0a57e26c19ab69d1d44))
+        expect(json['deploys'].map { |d| d['revision'] }).to eql(%w(30e7c2ff8758f4f19bfbc0a57e26c19ab69d1d44))
       end
 
       it "should return empty arrays for bugs with no recent occurrences" do
         @bug.occurrences.delete_all
         get :histogram, polymorphic_params(@bug, true, dimensions: %w( host pid ), step: 1000*60*60*5, size: 20, format: 'json')
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql('occurrences' => [], 'deploys' => [])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql('occurrences' => [], 'deploys' => [])
       end
     end
   end
@@ -110,7 +110,7 @@ def sort(occurrences, reverse=false)
 
     it "should require a logged-in user" do
       get :aggregate, polymorphic_params(@bug, true)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -127,15 +127,15 @@ def sort(occurrences, reverse=false)
 
       before :each do
         login_as @bug.environment.project.owner
-        Time.stub!(:now).and_return(Time.at(1234567890)) # make sure we don't get boundary errors
+        allow(Time).to receive(:now).and_return(Time.at(1234567890)) # make sure we don't get boundary errors
       end
 
       it_should_behave_like "action that 404s at appropriate times", :get, :aggregate, "polymorphic_params(@bug, true, dimensions: %w( host pid ), step: 1000*60*60*5, size: 20, format: 'json')"
 
       it "should aggregate occurrences based on given dimensions" do
         get :aggregate, polymorphic_params(@bug, true, dimensions: %w( host pid ), step: 1000*60*60*5, size: 20, format: 'json')
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql({
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql({
                                                  "host" => [
                                                      {"label" => "host2", "data" => [[1234209600000, 100.0], [1234213200000, 100.0], [1234216800000, 0.0], [1234220400000, 0.0], [1234224000000, 100.0], [1234227600000, 100.0], [1234231200000, 0.0], [1234234800000, 0.0], [1234238400000, 100.0], [1234242000000, 100.0], [1234245600000, 0.0], [1234249200000, 0.0], [1234252800000, 100.0], [1234256400000, 100.0], [1234260000000, 0.0], [1234263600000, 0.0], [1234267200000, 100.0], [1234270800000, 100.0], [1234274400000, 0.0], [1234278000000, 0.0], [1234281600000, 100.0], [1234285200000, 100.0], [1234288800000, 0.0], [1234292400000, 0.0], [1234296000000, 100.0], [1234299600000, 100.0], [1234303200000, 0.0], [1234306800000, 0.0], [1234310400000, 100.0], [1234314000000, 100.0], [1234317600000, 0.0], [1234321200000, 0.0], [1234324800000, 100.0], [1234328400000, 100.0], [1234332000000, 0.0], [1234335600000, 0.0], [1234339200000, 100.0], [1234342800000, 100.0], [1234346400000, 0.0], [1234350000000, 0.0], [1234353600000, 100.0], [1234357200000, 100.0], [1234360800000, 0.0], [1234364400000, 0.0], [1234368000000, 100.0], [1234371600000, 100.0], [1234375200000, 0.0], [1234378800000, 0.0], [1234382400000, 100.0], [1234386000000, 100.0], [1234389600000, 0.0], [1234393200000, 0.0], [1234396800000, 100.0], [1234400400000, 100.0], [1234404000000, 0.0], [1234407600000, 0.0], [1234411200000, 100.0], [1234414800000, 100.0], [1234418400000, 0.0], [1234422000000, 0.0], [1234425600000, 100.0], [1234429200000, 100.0], [1234432800000, 0.0], [1234436400000, 0.0], [1234440000000, 100.0], [1234443600000, 100.0], [1234447200000, 0.0], [1234450800000, 0.0], [1234454400000, 100.0], [1234458000000, 100.0], [1234461600000, 0.0], [1234465200000, 0.0], [1234468800000, 100.0], [1234472400000, 100.0], [1234476000000, 0.0], [1234479600000, 0.0], [1234483200000, 100.0], [1234486800000, 100.0], [1234490400000, 0.0], [1234494000000, 0.0], [1234497600000, 100.0], [1234501200000, 100.0], [1234504800000, 0.0], [1234508400000, 0.0], [1234512000000, 100.0], [1234515600000, 100.0], [1234519200000, 0.0], [1234522800000, 0.0], [1234526400000, 100.0], [1234530000000, 100.0], [1234533600000, 0.0], [1234537200000, 0.0], [1234540800000, 100.0], [1234544400000, 100.0], [1234548000000, 0.0], [1234551600000, 0.0], [1234555200000, 100.0], [1234558800000, 100.0], [1234562400000, 0.0], [1234566000000, 0.0]]},
                                                      {"label" => "host1", "data" => [[1234209600000, 0.0], [1234213200000, 0.0], [1234216800000, 100.0], [1234220400000, 100.0], [1234224000000, 0.0], [1234227600000, 0.0], [1234231200000, 100.0], [1234234800000, 100.0], [1234238400000, 0.0], [1234242000000, 0.0], [1234245600000, 100.0], [1234249200000, 100.0], [1234252800000, 0.0], [1234256400000, 0.0], [1234260000000, 100.0], [1234263600000, 100.0], [1234267200000, 0.0], [1234270800000, 0.0], [1234274400000, 100.0], [1234278000000, 100.0], [1234281600000, 0.0], [1234285200000, 0.0], [1234288800000, 100.0], [1234292400000, 100.0], [1234296000000, 0.0], [1234299600000, 0.0], [1234303200000, 100.0], [1234306800000, 100.0], [1234310400000, 0.0], [1234314000000, 0.0], [1234317600000, 100.0], [1234321200000, 100.0], [1234324800000, 0.0], [1234328400000, 0.0], [1234332000000, 100.0], [1234335600000, 100.0], [1234339200000, 0.0], [1234342800000, 0.0], [1234346400000, 100.0], [1234350000000, 100.0], [1234353600000, 0.0], [1234357200000, 0.0], [1234360800000, 100.0], [1234364400000, 100.0], [1234368000000, 0.0], [1234371600000, 0.0], [1234375200000, 100.0], [1234378800000, 100.0], [1234382400000, 0.0], [1234386000000, 0.0], [1234389600000, 100.0], [1234393200000, 100.0], [1234396800000, 0.0], [1234400400000, 0.0], [1234404000000, 100.0], [1234407600000, 100.0], [1234411200000, 0.0], [1234414800000, 0.0], [1234418400000, 100.0], [1234422000000, 100.0], [1234425600000, 0.0], [1234429200000, 0.0], [1234432800000, 100.0], [1234436400000, 100.0], [1234440000000, 0.0], [1234443600000, 0.0], [1234447200000, 100.0], [1234450800000, 100.0], [1234454400000, 0.0], [1234458000000, 0.0], [1234461600000, 100.0], [1234465200000, 100.0], [1234468800000, 0.0], [1234472400000, 0.0], [1234476000000, 100.0], [1234479600000, 100.0], [1234483200000, 0.0], [1234486800000, 0.0], [1234490400000, 100.0], [1234494000000, 100.0], [1234497600000, 0.0], [1234501200000, 0.0], [1234504800000, 100.0], [1234508400000, 100.0], [1234512000000, 0.0], [1234515600000, 0.0], [1234519200000, 100.0], [1234522800000, 100.0], [1234526400000, 0.0], [1234530000000, 0.0], [1234533600000, 100.0], [1234537200000, 100.0], [1234540800000, 0.0], [1234544400000, 0.0], [1234548000000, 100.0], [1234551600000, 100.0], [1234555200000, 0.0], [1234558800000, 0.0], [1234562400000, 100.0], [1234566000000, 100.0]]}
@@ -149,7 +149,7 @@ def sort(occurrences, reverse=false)
 
       it "should collapse duplicate dimensions" do
         get :aggregate, polymorphic_params(@bug, true, dimensions: %w( host host pid ), step: 1000*60*60*5, size: 20, format: 'json')
-        JSON.parse(response.body).should eql({
+        expect(JSON.parse(response.body)).to eql({
                                                  "host" => [
                                                      {"label" => "host2", "data" => [[1234209600000, 100.0], [1234213200000, 100.0], [1234216800000, 0.0], [1234220400000, 0.0], [1234224000000, 100.0], [1234227600000, 100.0], [1234231200000, 0.0], [1234234800000, 0.0], [1234238400000, 100.0], [1234242000000, 100.0], [1234245600000, 0.0], [1234249200000, 0.0], [1234252800000, 100.0], [1234256400000, 100.0], [1234260000000, 0.0], [1234263600000, 0.0], [1234267200000, 100.0], [1234270800000, 100.0], [1234274400000, 0.0], [1234278000000, 0.0], [1234281600000, 100.0], [1234285200000, 100.0], [1234288800000, 0.0], [1234292400000, 0.0], [1234296000000, 100.0], [1234299600000, 100.0], [1234303200000, 0.0], [1234306800000, 0.0], [1234310400000, 100.0], [1234314000000, 100.0], [1234317600000, 0.0], [1234321200000, 0.0], [1234324800000, 100.0], [1234328400000, 100.0], [1234332000000, 0.0], [1234335600000, 0.0], [1234339200000, 100.0], [1234342800000, 100.0], [1234346400000, 0.0], [1234350000000, 0.0], [1234353600000, 100.0], [1234357200000, 100.0], [1234360800000, 0.0], [1234364400000, 0.0], [1234368000000, 100.0], [1234371600000, 100.0], [1234375200000, 0.0], [1234378800000, 0.0], [1234382400000, 100.0], [1234386000000, 100.0], [1234389600000, 0.0], [1234393200000, 0.0], [1234396800000, 100.0], [1234400400000, 100.0], [1234404000000, 0.0], [1234407600000, 0.0], [1234411200000, 100.0], [1234414800000, 100.0], [1234418400000, 0.0], [1234422000000, 0.0], [1234425600000, 100.0], [1234429200000, 100.0], [1234432800000, 0.0], [1234436400000, 0.0], [1234440000000, 100.0], [1234443600000, 100.0], [1234447200000, 0.0], [1234450800000, 0.0], [1234454400000, 100.0], [1234458000000, 100.0], [1234461600000, 0.0], [1234465200000, 0.0], [1234468800000, 100.0], [1234472400000, 100.0], [1234476000000, 0.0], [1234479600000, 0.0], [1234483200000, 100.0], [1234486800000, 100.0], [1234490400000, 0.0], [1234494000000, 0.0], [1234497600000, 100.0], [1234501200000, 100.0], [1234504800000, 0.0], [1234508400000, 0.0], [1234512000000, 100.0], [1234515600000, 100.0], [1234519200000, 0.0], [1234522800000, 0.0], [1234526400000, 100.0], [1234530000000, 100.0], [1234533600000, 0.0], [1234537200000, 0.0], [1234540800000, 100.0], [1234544400000, 100.0], [1234548000000, 0.0], [1234551600000, 0.0], [1234555200000, 100.0], [1234558800000, 100.0], [1234562400000, 0.0], [1234566000000, 0.0]]},
                                                      {"label" => "host1", "data" => [[1234209600000, 0.0], [1234213200000, 0.0], [1234216800000, 100.0], [1234220400000, 100.0], [1234224000000, 0.0], [1234227600000, 0.0], [1234231200000, 100.0], [1234234800000, 100.0], [1234238400000, 0.0], [1234242000000, 0.0], [1234245600000, 100.0], [1234249200000, 100.0], [1234252800000, 0.0], [1234256400000, 0.0], [1234260000000, 100.0], [1234263600000, 100.0], [1234267200000, 0.0], [1234270800000, 0.0], [1234274400000, 100.0], [1234278000000, 100.0], [1234281600000, 0.0], [1234285200000, 0.0], [1234288800000, 100.0], [1234292400000, 100.0], [1234296000000, 0.0], [1234299600000, 0.0], [1234303200000, 100.0], [1234306800000, 100.0], [1234310400000, 0.0], [1234314000000, 0.0], [1234317600000, 100.0], [1234321200000, 100.0], [1234324800000, 0.0], [1234328400000, 0.0], [1234332000000, 100.0], [1234335600000, 100.0], [1234339200000, 0.0], [1234342800000, 0.0], [1234346400000, 100.0], [1234350000000, 100.0], [1234353600000, 0.0], [1234357200000, 0.0], [1234360800000, 100.0], [1234364400000, 100.0], [1234368000000, 0.0], [1234371600000, 0.0], [1234375200000, 100.0], [1234378800000, 100.0], [1234382400000, 0.0], [1234386000000, 0.0], [1234389600000, 100.0], [1234393200000, 100.0], [1234396800000, 0.0], [1234400400000, 0.0], [1234404000000, 100.0], [1234407600000, 100.0], [1234411200000, 0.0], [1234414800000, 0.0], [1234418400000, 100.0], [1234422000000, 100.0], [1234425600000, 0.0], [1234429200000, 0.0], [1234432800000, 100.0], [1234436400000, 100.0], [1234440000000, 0.0], [1234443600000, 0.0], [1234447200000, 100.0], [1234450800000, 100.0], [1234454400000, 0.0], [1234458000000, 0.0], [1234461600000, 100.0], [1234465200000, 100.0], [1234468800000, 0.0], [1234472400000, 0.0], [1234476000000, 100.0], [1234479600000, 100.0], [1234483200000, 0.0], [1234486800000, 0.0], [1234490400000, 100.0], [1234494000000, 100.0], [1234497600000, 0.0], [1234501200000, 0.0], [1234504800000, 100.0], [1234508400000, 100.0], [1234512000000, 0.0], [1234515600000, 0.0], [1234519200000, 100.0], [1234522800000, 100.0], [1234526400000, 0.0], [1234530000000, 0.0], [1234533600000, 100.0], [1234537200000, 100.0], [1234540800000, 0.0], [1234544400000, 0.0], [1234548000000, 100.0], [1234551600000, 100.0], [1234555200000, 0.0], [1234558800000, 0.0], [1234562400000, 100.0], [1234566000000, 100.0]]}
@@ -163,23 +163,23 @@ def sort(occurrences, reverse=false)
 
       it "should 422 for non-aggregating dimensions" do
         get :aggregate, polymorphic_params(@bug, true, dimensions: %w( host pid lat ), step: 1000*60*60*5, size: 20, format: 'json')
-        response.status.should eql(422)
+        expect(response.status).to eql(422)
       end
 
       it "should 422 for nonexistent dimensions" do
         get :aggregate, polymorphic_params(@bug, true, dimensions: %w( host pid madeup ), step: 1000*60*60*5, size: 20, format: 'json')
-        response.status.should eql(422)
+        expect(response.status).to eql(422)
       end
 
       it "should return an empty array given no dimensions" do
         get :aggregate, polymorphic_params(@bug, true, dimensions: [], step: 1000*60*60*5, size: 20, format: 'json')
-        response.status.should eql(200)
-        response.body.should eql('[]')
+        expect(response.status).to eql(200)
+        expect(response.body).to eql('[]')
       end
 
       it "should 422 given too many dimensions" do
         get :aggregate, polymorphic_params(@bug, true, dimensions: %w( host pid client revision browser_os ), step: 1000*60*60*5, size: 20, format: 'json')
-        response.status.should eql(422)
+        expect(response.status).to eql(422)
       end
     end
   end
@@ -189,7 +189,7 @@ def sort(occurrences, reverse=false)
 
     it "should require a logged-in user" do
       get :aggregate, polymorphic_params(@occurrence, false)
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -201,7 +201,7 @@ def sort(occurrences, reverse=false)
 
       it "should not raise an exception for improperly-formatted JSON" do
         @occurrence.ivars = {foo: {bar: 'baz'}}
-        -> { get :show, polymorphic_params(@occurrence, false) }.should_not raise_error
+        expect { get :show, polymorphic_params(@occurrence, false) }.not_to raise_error
       end
     end
   end
diff --git a/spec/controllers/project/membership_controller_spec.rb b/spec/controllers/project/membership_controller_spec.rb
index 9783888d..2af41758 100644
--- a/spec/controllers/project/membership_controller_spec.rb
+++ b/spec/controllers/project/membership_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Project::MembershipController do
+RSpec.describe Project::MembershipController, type: :controller do
   describe "#join" do
     before :each do
       @project = FactoryGirl.create(:project)
@@ -23,8 +23,8 @@
 
     it "should require a logged-in user" do
       post :join, project_id: @project.to_param
-      response.should redirect_to(login_url(next: request.fullpath))
-      @project.memberships.count.should eql(1)
+      expect(response).to redirect_to(login_url(next: request.fullpath))
+      expect(@project.memberships.count).to eql(1)
     end
 
     context "[authenticated]" do
@@ -34,16 +34,16 @@
         FactoryGirl.create :membership, project: @project, user: @user
         post :join, project_id: @project.to_param
 
-        response.should redirect_to(project_url(@project))
-        @project.memberships.count.should eql(2)
+        expect(response).to redirect_to(project_url(@project))
+        expect(@project.memberships.count).to eql(2)
       end
 
       it "should create a new membership" do
         post :join, project_id: @project.to_param
 
-        response.should redirect_to(project_url(@project))
-        @project.memberships.count.should eql(2)
-        @user.role(@project).should eql(:member)
+        expect(response).to redirect_to(project_url(@project))
+        expect(@project.memberships.count).to eql(2)
+        expect(@user.role(@project)).to eql(:member)
       end
     end
   end
@@ -52,24 +52,23 @@
     before(:each) { @membership = FactoryGirl.create(:membership) }
 
     it "should require a logged-in user" do
-      put :update, project_id: @membership.project.to_param, membership: {send_comment_emails: '1'}
-      response.should redirect_to(login_url(next: request.fullpath))
-      @membership.reload.send_comment_emails.should be_false
+      patch :update, project_id: @membership.project.to_param, membership: {send_comment_emails: '1'}
+      expect(response).to redirect_to(login_url(next: request.fullpath))
+      expect(@membership.reload.send_comment_emails).to eql(false)
     end
 
     context "[authenticated]" do
       before(:each) { login_as @membership.user }
 
       it "should modify the membership" do
-        put :update, project_id: @membership.project.to_param, membership: {send_comment_emails: '1'}
-        response.status.should redirect_to(edit_project_my_membership_url(@membership.project))
-        @membership.reload.send_comment_emails.should be_true
+        patch :update, project_id: @membership.project.to_param, membership: {send_comment_emails: '1'}
+        expect(response.status).to redirect_to(edit_project_my_membership_url(@membership.project))
+        expect(@membership.reload.send_comment_emails).to eql(true)
       end
 
       it "should not allow protected attributes to be updated" do
-        put :update, project_id: @membership.project.to_param, membership: {project_id: 123}
-        response.status.should redirect_to(root_url)
-        -> { @membership.reload }.should_not change(@membership, :project_id)
+        patch :update, project_id: @membership.project.to_param, membership: {project_id: 123}
+        expect { @membership.reload }.not_to change(@membership, :project_id)
       end
     end
   end
@@ -79,13 +78,13 @@
 
     it "should require a logged-in user" do
       delete :destroy, project_id: @membership.project.to_param
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     it "should not allow the owner to delete his/her project" do
       login_as @membership.project.owner
       delete :destroy, project_id: @membership.project.to_param
-      response.should redirect_to(account_url)
+      expect(response).to redirect_to(account_url)
     end
 
     context "[authenticated]" do
@@ -93,8 +92,8 @@
 
       it "should delete the membership" do
         delete :destroy, project_id: @membership.project.to_param
-        response.should redirect_to(account_url)
-        -> { @membership.reload }.should raise_error(ActiveRecord::RecordNotFound)
+        expect(response).to redirect_to(account_url)
+        expect { @membership.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
diff --git a/spec/controllers/project/memberships_controller_spec.rb b/spec/controllers/project/memberships_controller_spec.rb
index 3dd1b787..745d51a3 100644
--- a/spec/controllers/project/memberships_controller_spec.rb
+++ b/spec/controllers/project/memberships_controller_spec.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,21 +14,21 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Project::MembershipsController do
+RSpec.describe Project::MembershipsController, type: :controller do
   describe "#index" do
     before :all do
       @project            = FactoryGirl.create(:project)
       User.where("username LIKE 'filter-%'").delete_all
       @filter_memberships = 11.times.map { |i| FactoryGirl.create(:membership, project: @project, created_at: Time.now - 1.month, user: FactoryGirl.create(:user, username: "filter-#{i}")) }
       FactoryGirl.create_list :membership, 11, project: @project
-      @memberships = @project.memberships.all # get the owner's membership too
+      @memberships = @project.memberships.to_a # get the owner's membership too
     end
 
     it "should require a logged-in user" do
       get :index, polymorphic_params(@project, true)
-      response.should redirect_to login_url(next: request.fullpath)
+      expect(response).to redirect_to login_url(next: request.fullpath)
     end
 
     context '[authenticated]' do
@@ -36,20 +36,20 @@
 
       it "should only allow projects that exist" do
         get :index, project_id: 'not-found'
-        response.status.should eql(404)
+        expect(response.status).to eql(404)
       end
 
       context '[JSON]' do
         it "should load the first 10 memberships" do
           get :index, polymorphic_params(@project, true, format: 'json')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['user']['username'] }.should eql(@memberships.sort_by(&:created_at).reverse.map(&:user).map(&:username)[0, 10])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['user']['username'] }).to eql(@memberships.sort_by(&:created_at).reverse.map(&:user).map(&:username)[0, 10])
         end
 
         it "should filter memberships by name when a query is given" do
           get :index, polymorphic_params(@project, true, format: 'json', query: 'filter')
-          response.status.should eql(200)
-          JSON.parse(response.body).map { |r| r['user']['username'] }.should eql(@filter_memberships.sort_by(&:created_at).reverse.map(&:user).map(&:username)[0, 10])
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).map { |r| r['user']['username'] }).to eql(@filter_memberships.sort_by(&:created_at).reverse.map(&:user).map(&:username)[0, 10])
         end
       end
     end
@@ -59,15 +59,15 @@
     before :all do
       @project = FactoryGirl.create(:project)
       FactoryGirl.create_list :membership, 100, project: @project
-      @memberships = @project.memberships.all # get the owner's membership too
+      @memberships = @project.memberships.to_a # get the owner's membership too
     end
 
     before(:each) { @user = FactoryGirl.create(:user) }
 
     it "should require a logged-in user" do
       post :create, polymorphic_params(@project, true, membership: {user_id: @user.id}, format: 'json')
-      response.status.should eql(401)
-      @project.memberships.map(&:user_id).should_not include(@user.id)
+      expect(response.status).to eql(401)
+      expect(@project.memberships.map(&:user_id)).not_to include(@user.id)
     end
 
     context '[authenticated]' do
@@ -75,54 +75,53 @@
 
       it "should only allow projects that exist and the user has a membership for" do
         post :create, project_id: 'not-found', membership: {user_id: @user.id}, format: 'json'
-        response.status.should eql(404)
+        expect(response.status).to eql(404)
 
         post :create, project_id: FactoryGirl.create(:project).to_param, membership: {user_id: @user.id}, format: 'json'
-        response.status.should eql(403)
+        expect(response.status).to eql(403)
       end
 
       it "should create the membership (created by owner)" do
         login_as @project.owner
         post :create, polymorphic_params(@project, true, membership: {user_id: @user.id}, format: 'json')
-        response.status.should eql(201)
-        (membership = @project.memberships.where(user_id: @user.id).first).should_not be_nil
-        response.body.should eql(membership.to_json)
+        expect(response.status).to eql(201)
+        expect(membership = @project.memberships.where(user_id: @user.id).first).not_to be_nil
+        expect(response.body).to eql(membership.to_json)
       end
 
       it "should allow admins to add members" do
         login_as FactoryGirl.create(:membership, project: @project, admin: true).user
         post :create, polymorphic_params(@project, true, membership: {user_id: @user.id}, format: 'json')
-        response.status.should eql(201)
-        @project.memberships.where(user_id: @user.id).first.should_not be_nil
+        expect(response.status).to eql(201)
+        expect(@project.memberships.where(user_id: @user.id).first).not_to be_nil
       end
 
       it "should not allow members to add other members" do
         login_as FactoryGirl.create(:membership, project: @project, admin: false).user
         post :create, polymorphic_params(@project, true, membership: {user_id: @user.id}, format: 'json')
-        response.status.should eql(403)
-        @project.memberships.where(user_id: @user.id).first.should be_nil
+        expect(response.status).to eql(403)
+        expect(@project.memberships.where(user_id: @user.id).first).to be_nil
       end
 
       it "should allow owners to create admins" do
         login_as @project.owner
         post :create, polymorphic_params(@project, true, membership: {user_id: @user.id, admin: 'true'}, format: 'json')
-        response.status.should eql(201)
+        expect(response.status).to eql(201)
         membership = @project.memberships.where(user_id: @user.id).first
-        membership.should_not be_nil
-        membership.should be_admin
+        expect(membership).not_to be_nil
+        expect(membership).to be_admin
       end
 
       it "should not allow admins to create admins" do
         login_as FactoryGirl.create(:membership, project: @project, admin: true).user
         post :create, polymorphic_params(@project, true, membership: {user_id: @user.id, admin: 'true'}, format: 'json')
-        response.status.should eql(400)
-        @project.memberships.where(user_id: @user.id).first.should be_nil
+        expect(@project.memberships.where(user_id: @user.id).first).not_to be_admin
       end
 
       it "should render the errors with status 422 if invalid" do
-        post :create, polymorphic_params(@project, true, membership: {}, format: 'json')
-        response.status.should eql(422)
-        response.body.should eql("{\"membership\":{\"user\":[\"can’t be blank\"]}}")
+        post :create, polymorphic_params(@project, true, membership: {user_id: 'halp', admin: 'true'}, format: 'json')
+        expect(response.status).to eql(422)
+        expect(response.body).to eql("{\"membership\":{\"user\":[\"can’t be blank\"]}}")
       end
     end
   end
@@ -132,49 +131,46 @@
     before(:each) { @membership = FactoryGirl.create(:membership, project: @project) }
 
     it "should require a logged-in administrator or owner" do
-      put :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
-      response.status.should eql(401)
-      @membership.reload.should_not be_admin
+      patch :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
+      expect(response.status).to eql(401)
+      expect(@membership.reload).not_to be_admin
 
       login_as FactoryGirl.create(:membership, project: @project).user
-      put :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
-      response.status.should eql(403)
-      @membership.reload.should_not be_admin
+      patch :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
+      expect(response.status).to eql(403)
+      expect(@membership.reload).not_to be_admin
     end
 
     context('[authenticated]') do
       before(:each) { login_as @project.owner }
 
       it "should only allow projects that exist and the user has a membership for" do
-        put :update, project_id: 'not-found', id: @membership.user.to_param, membership: {admin: true}, format: 'json'
-        response.status.should eql(404)
+        patch :update, project_id: 'not-found', id: @membership.user.to_param, membership: {admin: true}, format: 'json'
+        expect(response.status).to eql(404)
 
         post :create, project_id: FactoryGirl.create(:project).to_param, id: @membership.user.to_param, membership: {admin: true}, format: 'json'
-        response.status.should eql(403)
+        expect(response.status).to eql(403)
       end
 
       it "should allow owners to promote or demote admins" do
-        put :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
-        response.status.should eql(200)
-        @membership.reload.should be_admin
-        response.body.should eql(@membership.to_json)
+        patch :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@membership.reload).to be_admin
+        expect(response.body).to eql(@membership.to_json)
 
-        put :update, polymorphic_params(@membership, false, membership: {admin: false}, format: 'json')
-        response.status.should eql(200)
-        @membership.reload.should_not be_admin
-        response.body.should eql(@membership.to_json)
+        patch :update, polymorphic_params(@membership, false, membership: {admin: false}, format: 'json')
+        expect(response.status).to eql(200)
+        expect(@membership.reload).not_to be_admin
+        expect(response.body).to eql(@membership.to_json)
       end
 
       it "should not allow admins to promote or demote admins" do
         login_as FactoryGirl.create(:membership, project: @project, admin: true).user
-        put :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
-        response.status.should eql(400)
-        @membership.reload.should_not be_admin
+        patch :update, polymorphic_params(@membership, false, membership: {admin: true}, format: 'json')
+        expect(@membership.reload).not_to be_admin
       end
 
-      it "should render the errors with status 422 if invalid" do
-        pending "No way to generate errors"
-      end
+      it "should render the errors with status 422 if invalid"
     end
   end
 
@@ -184,13 +180,13 @@
 
     it "should require a logged-in administrator or owner" do
       delete :destroy, polymorphic_params(@membership, false, format: 'json')
-      response.status.should eql(401)
-      -> { @membership.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect(response.status).to eql(401)
+      expect { @membership.reload }.not_to raise_error
 
       login_as FactoryGirl.create(:membership, project: @project).user
       delete :destroy, polymorphic_params(@membership, false, format: 'json')
-      response.status.should eql(403)
-      -> { @membership.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect(response.status).to eql(403)
+      expect { @membership.reload }.not_to raise_error
     end
 
     context '[authenticated]' do
@@ -198,31 +194,31 @@
 
       it "should only allow projects that exist and the user has a membership for" do
         delete :destroy, project_id: 'not-found', id: @membership.user.to_param, format: 'json'
-        response.status.should eql(404)
+        expect(response.status).to eql(404)
 
         delete :destroy, project_id: FactoryGirl.create(:project).to_param, id: @membership.user.to_param, format: 'json'
-        response.status.should eql(404)
+        expect(response.status).to eql(404)
       end
 
       it "should destroy the membership" do
         delete :destroy, polymorphic_params(@membership, false, format: 'json')
-        response.status.should eql(204)
-        -> { @membership.reload }.should raise_error(ActiveRecord::RecordNotFound)
+        expect(response.status).to eql(204)
+        expect { @membership.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
 
       it "should not allow admins to delete other admins" do
         login_as FactoryGirl.create(:membership, project: @project, admin: true).user
         @membership.update_attribute :admin, true
         delete :destroy, polymorphic_params(@membership, false, format: 'json')
-        response.status.should eql(403)
-        -> { @membership.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+        expect(response.status).to eql(403)
+        expect { @membership.reload }.not_to raise_error
       end
 
       it "should allow the owner to delete other admins" do
         @membership.update_attribute :admin, true
         delete :destroy, polymorphic_params(@membership, false, format: 'json')
-        response.status.should eql(204)
-        -> { @membership.reload }.should raise_error(ActiveRecord::RecordNotFound)
+        expect(response.status).to eql(204)
+        expect { @membership.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 4d86f846..40494c31 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe ProjectsController do
+RSpec.describe ProjectsController, type: :controller do
   describe "#index" do
     before(:all) { @user = FactoryGirl.create(:user) }
 
     it "should require a logged-in user" do
       get :index
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     context '[authenticated]' do
@@ -37,20 +37,20 @@
         it "should find up to 25 projects by search query" do
           get :index, query: 'find me', format: 'json'
 
-          response.status.should eql(200)
+          expect(response.status).to eql(200)
           json = JSON.parse(response.body)
-          json.size.should eql(25)
+          expect(json.size).to eql(25)
           json.each_with_index do |proj, i|
-            proj['url'].should eql("http://test.host/projects/find-me-#{25-i}")
-            proj['join_url'].should eql("http://test.host/projects/find-me-#{25-i}/membership/join")
-            proj['owner']['url'].should include('/users/')
+            expect(proj['url']).to eql("http://test.host/projects/find-me-#{25-i}")
+            expect(proj['join_url']).to eql("http://test.host/projects/find-me-#{25-i}/membership/join")
+            expect(proj['owner']['url']).to include('/users/')
           end
         end
 
         it "should return all projects if the query is empty" do
           get :index, format: 'json'
-          response.status.should eql(200)
-          JSON.parse(response.body).size.should eql(25)
+          expect(response.status).to eql(200)
+          expect(JSON.parse(response.body).size).to eql(25)
         end
       end
     end
@@ -58,8 +58,8 @@
 
   describe "#create" do
     it "should require a logged-in user" do
-      -> { post :create, project: {name: 'New Project', repository_url: 'git://github.com/RISCfuture/better_caller.git'}, format: 'json' }.should_not change(Project, :count)
-      response.status.should eql(401)
+      expect { post :create, project: {name: 'New Project', repository_url: 'https://github.com/RISCfuture/better_caller.git'}, format: 'json' }.not_to change(Project, :count)
+      expect(response.status).to eql(401)
     end
 
     context '[authenticated]' do
@@ -69,23 +69,21 @@
       end
 
       it "should create the new project" do
-        post :create, project: {name: 'New Project', repository_url: 'git://github.com/RISCfuture/better_caller.git'}, format: 'json'
-        response.status.should eql(201)
+        post :create, project: {name: 'New Project', repository_url: 'https://github.com/RISCfuture/better_caller.git'}, format: 'json'
+        expect(response.status).to eql(201)
         json = JSON.parse(response.body)
-        json['name'].should eql('New Project')
-        json['repository_url'].should eql('git://github.com/RISCfuture/better_caller.git')
+        expect(json['name']).to eql('New Project')
+        expect(json['repository_url']).to eql('https://github.com/RISCfuture/better_caller.git')
       end
 
       it "should validate project connectivity" do
-        post :create, project: {name: 'New Project', repository_url: 'git://github.com/RISCfuture/nonexistent.git'}, format: 'json'
-        response.status.should eql(422)
+        post :create, project: {name: 'New Project', repository_url: 'git@github.com:RISCfuture/nonexistent.git'}, format: 'json'
+        expect(response.status).to eql(422)
         json = JSON.parse(response.body)
-        json.should eql({'project' => {'repository_url' => ['is not accessible']}})
+        expect(json).to eql({'project' => {'repository_url' => ['is not accessible']}})
       end
 
-      it "should not allow protected fields to be set" do
-        pending "No protected fields"
-      end
+      it "should not allow protected fields to be set"
     end
   end
 
@@ -94,19 +92,19 @@
 
     it "should require a logged-in user" do
       get :edit, id: @project.to_param
-      response.should redirect_to(login_url(next: request.fullpath))
+      expect(response).to redirect_to(login_url(next: request.fullpath))
     end
 
     it "should allow a project member" do
       login_as FactoryGirl.create(:membership, project: @project).user
       get :edit, id: @project.to_param
-      response.should be_success
+      expect(response).to be_success
     end
 
     it "should allow a project admin" do
       login_as FactoryGirl.create(:membership, project: @project, admin: true).user
       get :edit, id: @project.to_param
-      response.should be_success
+      expect(response).to be_success
     end
 
     context '[authenticated]' do
@@ -114,8 +112,8 @@
 
       it "should create filter_paths_string and whitelist_paths_string attributes" do
         get :edit, id: @project.to_param
-        assigns(:project).filter_paths_string.should eql(@project.filter_paths.join("\n"))
-        assigns(:project).whitelist_paths_string.should eql(@project.whitelist_paths.join("\n"))
+        expect(assigns(:project).filter_paths_string).to eql(@project.filter_paths.join("\n"))
+        expect(assigns(:project).whitelist_paths_string).to eql(@project.whitelist_paths.join("\n"))
       end
     end
   end
@@ -123,13 +121,13 @@
   describe "#update" do
     before :each do
       Project.delete_all
-      @project = FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git')
+      @project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
     end
 
     it "should require a logged-in user" do
-      put :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
-      response.status.should eql(401)
-      @project.reload.name.should_not eql('New Name')
+      patch :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
+      expect(response.status).to eql(401)
+      expect(@project.reload.name).not_to eql('New Name')
     end
 
     context '[authenticated]' do
@@ -139,49 +137,46 @@
         user = FactoryGirl.create(:membership, project: @project, admin: true).user
         login_as user
 
-        put :update, id: @project.to_param, project: {owner_id: user.id}, format: 'json'
-        response.status.should eql(400)
-        @project.reload.owner.should_not eql(user)
+        patch :update, id: @project.to_param, project: {owner_id: user.id}, format: 'json'
+        expect(@project.reload.owner).not_to eql(user)
       end
 
       it "should not allow members to alter the project" do
         login_as FactoryGirl.create(:membership, project: @project, admin: false).user
-        put :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
-        response.status.should eql(403)
-        @project.reload.name.should_not eql('New Name')
+        patch :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
+        expect(response.status).to eql(403)
+        expect(@project.reload.name).not_to eql('New Name')
       end
 
       it "should allow owners to alter the project" do
-        put :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
-        response.status.should eql(200)
-        @project.reload.name.should eql('New Name')
-        response.body.should eql(@project.to_json)
+        patch :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
+        expect(response.status).to eql(200)
+        expect(@project.reload.name).to eql('New Name')
+        expect(response.body).to eql(@project.to_json)
       end
 
       it "should convert filter_paths_string into filter_paths" do
-        put :update, id: @project.to_param, project: {filter_paths_string: "a\nb\n"}, format: 'json'
-        @project.reload.filter_paths.should eql(%w( a b ))
+        patch :update, id: @project.to_param, project: {filter_paths_string: "a\nb\n"}, format: 'json'
+        expect(@project.reload.filter_paths).to eql(%w( a b ))
       end
 
       it "should convert whitelist_paths_string into whitelist_paths" do
-        put :update, id: @project.to_param, project: {whitelist_paths_string: "a\nb\n"}, format: 'json'
-        @project.reload.whitelist_paths.should eql(%w( a b ))
+        patch :update, id: @project.to_param, project: {whitelist_paths_string: "a\nb\n"}, format: 'json'
+        expect(@project.reload.whitelist_paths).to eql(%w( a b ))
       end
 
-      it "should not allow protected fields to be set" do
-        pending "No protected fields"
-      end
+      it "should not allow protected fields to be set"
 
       it "should set Project#uses_releases_override if uses_releases is changed" do
         @project.update_attribute :uses_releases, true
-        put :update, id: @project.to_param, project: {uses_releases: false}, format: 'json'
-        @project.reload.uses_releases?.should be_false
-        @project.reload.uses_releases_override?.should be_true
+        patch :update, id: @project.to_param, project: {uses_releases: false}, format: 'json'
+        expect(@project.reload.uses_releases?).to eql(false)
+        expect(@project.reload.uses_releases_override?).to eql(true)
       end
 
       it "should not set Project#uses_releases_override if uses_releases is not changed" do
-        put :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
-        @project.reload.uses_releases_override?.should be_false
+        patch :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
+        expect(@project.reload.uses_releases_override?).to eql(false)
       end
     end
   end
@@ -190,9 +185,9 @@
       before(:each) { @project = FactoryGirl.create(:project) }
 
       it "should require a logged-in user" do
-        put :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
-        response.status.should eql(401)
-        @project.reload.name.should_not eql('New Name')
+        patch :update, id: @project.to_param, project: {name: 'New Name'}, format: 'json'
+        expect(response.status).to eql(401)
+        expect(@project.reload.name).not_to eql('New Name')
       end
 
       context '[authenticated]' do
@@ -200,23 +195,23 @@
 
         it "should not allow members to generate an API key" do
           login_as FactoryGirl.create(:membership, project: @project, admin: false).user
-          put :rekey, id: @project.to_param, format: 'json'
-          response.status.should eql(403)
-          -> { @project.reload }.should_not change(@project, :api_key)
+          patch :rekey, id: @project.to_param, format: 'json'
+          expect(response.status).to eql(403)
+          expect { @project.reload }.not_to change(@project, :api_key)
         end
 
         it "should allow admins to generate an API key" do
-          put :rekey, id: @project.to_param, format: 'json'
-          response.status.should redirect_to(edit_project_url(@project))
-          -> { @project.reload }.should change(@project, :api_key)
-          flash[:success].should include(@project.api_key)
+          patch :rekey, id: @project.to_param, format: 'json'
+          expect(response.status).to redirect_to(edit_project_url(@project))
+          expect { @project.reload }.to change(@project, :api_key)
+          expect(flash[:success]).to include(@project.api_key)
         end
 
         it "should allow owners to generate an API key" do
-          put :rekey, id: @project.to_param, format: 'json'
-          response.status.should redirect_to(edit_project_url(@project))
-          -> { @project.reload }.should change(@project, :api_key)
-          flash[:success].should include(@project.api_key)
+          patch :rekey, id: @project.to_param, format: 'json'
+          expect(response.status).to redirect_to(edit_project_url(@project))
+          expect { @project.reload }.to change(@project, :api_key)
+          expect(flash[:success]).to include(@project.api_key)
         end
       end
     end
@@ -226,8 +221,8 @@
 
     it "should require a logged-in user" do
       delete :destroy, id: @project.to_param
-      response.status.should redirect_to(login_url(next: request.fullpath))
-      -> { @project.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect(response.status).to redirect_to(login_url(next: request.fullpath))
+      expect { @project.reload }.not_to raise_error
     end
 
     context '[authenticated]' do
@@ -236,194 +231,22 @@
       it "should not allow admins to delete the project" do
         login_as FactoryGirl.create(:membership, project: @project, admin: true).user
         delete :destroy, id: @project.to_param
-        response.status.should redirect_to(root_url)
-        -> { @project.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+        expect(response.status).to redirect_to(root_url)
+        expect { @project.reload }.not_to raise_error
       end
 
       it "should not allow members to delete the project" do
         login_as FactoryGirl.create(:membership, project: @project, admin: false).user
         delete :destroy, id: @project.to_param
-        response.status.should redirect_to(root_url)
-        -> { @project.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+        expect(response.status).to redirect_to(root_url)
+        expect { @project.reload }.not_to raise_error
       end
 
       it "should allow owners to delete project" do
         delete :destroy, id: @project.to_param
-        response.status.should redirect_to root_url
-        flash[:success].should include('was deleted')
-        -> { @project.reload }.should raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-  end
-
-  describe "#context" do
-    before(:all) do
-      Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-      @project = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
-    end
-    before(:each) { @valid_params = {id: @project.to_param, revision: '30e7c2ff8758f4f19bfbc0a57e26c19ab69d1d44', file: 'lib/better_caller/extensions.rb', line: 7, format: 'json'} }
-
-    it "should require a logged-in user" do
-      get :context, @valid_params
-      response.status.should eql(401)
-    end
-
-    context '[authenticated]' do
-      before(:each) { login_as @project.owner }
-
-      it "should return an error if the project has no repository" do
-        project = FactoryGirl.create(:project, owner: @project.owner, repository_url: 'git://github.com/RISCfuture/doesnt-exist.git')
-        get :context, @valid_params.merge(id: project.to_param)
-        response.status.should eql(422)
-        JSON.parse(response.body)['error'].should include('repository')
-      end
-
-      it "should return an error if the revision param is missing" do
-        get :context, @valid_params.merge(revision: nil)
-        response.status.should eql(400)
-        JSON.parse(response.body)['error'].should include('Missing')
-      end
-
-      it "should return an error if the file param is missing" do
-        get :context, @valid_params.merge(file: nil)
-        response.status.should eql(400)
-        JSON.parse(response.body)['error'].should include('Missing')
-      end
-
-      it "should return an error if the line param is missing" do
-        get :context, @valid_params.merge(line: nil)
-        response.status.should eql(400)
-        JSON.parse(response.body)['error'].should include('Missing')
-      end
-
-      it "should return an error if the line param is less than 1" do
-        get :context, @valid_params.merge(line: 0)
-        response.status.should eql(422)
-        JSON.parse(response.body)['error'].should include('out of range')
-      end
-
-      it "should return an error if the line param is greater than the number of lines in the file" do
-        get :context, @valid_params.merge(line: 15)
-        response.status.should eql(422)
-        JSON.parse(response.body)['error'].should include('out of range')
-      end
-
-      it "should use 3 lines of context by default" do
-        get :context, @valid_params
-        response.status.should eql(200)
-        JSON.parse(response.body)['code'].should eql(<<-TEXT.chomp)
-  def set_better_backtrace(bt)
-    @better_backtrace = bt.collect do |(file, line, meth, bind)|
-      vars = {
-        local_variables: eval("local_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-        instance_variables: eval("instance_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-        global_variables: eval("global_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-      }
-        TEXT
-      end
-
-      it "should use 3 lines context if an invalid value for the context param is given" do
-        get :context, @valid_params.merge(context: -1)
-        response.status.should eql(200)
-        JSON.parse(response.body)['code'].should eql(<<-TEXT.chomp)
-  def set_better_backtrace(bt)
-    @better_backtrace = bt.collect do |(file, line, meth, bind)|
-      vars = {
-        local_variables: eval("local_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-        instance_variables: eval("instance_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-        global_variables: eval("global_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-      }
-        TEXT
-      end
-
-      it "should use a custom number of lines of context" do
-        get :context, @valid_params.merge(context: 2)
-        response.status.should eql(200)
-        JSON.parse(response.body)['code'].should eql(<<-TEXT.chomp)
-    @better_backtrace = bt.collect do |(file, line, meth, bind)|
-      vars = {
-        local_variables: eval("local_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-        instance_variables: eval("instance_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-        global_variables: eval("global_variables.inject({}) { |hsh, var| hsh[var] = eval(var) ; hsh }", bind),
-        TEXT
-      end
-
-      it "should clamp the context at the top of the file" do
-        get :context, @valid_params.merge(line: 1)
-        response.status.should eql(200)
-        JSON.parse(response.body)['code'].should eql(<<-TEXT.chomp)
-# @private
-class Exception
-  # @private
-  def set_better_backtrace(bt)
-        TEXT
-      end
-
-      it "should clamp the context at the bottom of the file" do
-        get :context, @valid_params.merge(line: 14)
-        response.status.should eql(200)
-        JSON.parse(response.body)['code'].should eql(<<-TEXT.chomp)
-      [ file, line, meth, vars]
-    end
-  end
-end
-        TEXT
-      end
-
-      it "should return an error given a nonexistent path" do
-        get :context, @valid_params.merge(file: 'foo/bar.rb')
-        response.status.should eql(422)
-        JSON.parse(response.body)['error'].should include('Couldn’t find that commit')
-      end
-
-      it "should update the repo given an unknown revision" do
-        Project.stub!(:find_from_slug!).and_return(@project)
-        @project.repo.should_receive(:fetch).once
-
-        get :context, @valid_params.merge(revision: '39aacf78b603ade2034e93b9b12420b350dfa151') # unknown revision
-        response.status.should eql(422)
-        JSON.parse(response.body)['error'].should include('Couldn’t find that commit')
-      end
-
-      it "should return an error given a nonexistent file" do
-        get :context, @valid_params.merge(file: 'lib/foo.rb')
-        response.status.should eql(422)
-        JSON.parse(response.body)['error'].should include('Couldn’t find that commit')
-      end
-
-      it "should pick an appropriate brush" do
-        get :context, @valid_params
-        response.status.should eql(200)
-        JSON.parse(response.body)['brush'].should eql('ruby')
-
-        get :context, @valid_params.merge(file: 'Rakefile')
-        response.status.should eql(200)
-        JSON.parse(response.body)['brush'].should eql('ruby')
-
-        get :context, @valid_params.merge(file: 'ext/better_caller.c')
-        response.status.should eql(200)
-        JSON.parse(response.body)['brush'].should eql('cpp')
-      end
-
-      it "should return a correct first_line value" do
-        get :context, @valid_params
-        response.status.should eql(200)
-        JSON.parse(response.body)['first_line'].should eql(4)
-      end
-
-      it "should reject blank lines from the top of the snippet" do
-        get :context, @valid_params.merge(file: 'LICENSE.txt', line: 5)
-        response.status.should eql(200)
-        rsp = JSON.parse(response.body)
-        rsp['first_line'].should eql(3)
-        rsp['code'].should eql(<<-TEXT.chomp)
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-        TEXT
+        expect(response.status).to redirect_to root_url
+        expect(flash[:success]).to include('was deleted')
+        expect { @project.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index f390e6f2..a53d34ad 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,16 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
-
-describe SearchController do
-  before :all do
-    Environment.delete_all
-    Project.delete_all
-    Slug.delete_all
-    User.delete_all
-    Rails.cache.clear
+require 'rails_helper'
 
+RSpec.describe SearchController, type: :controller do
+  before :each do
     @project     = FactoryGirl.create(:project, name: 'Example Project')
     @environment = FactoryGirl.create(:environment, name: 'production', project: @project)
     @bug         = FactoryGirl.create(:bug, environment: @environment)
@@ -37,172 +31,172 @@
       it "should respond with the URL for a user given a @username" do
         user = FactoryGirl.create(:user, username: 'foobar', first_name: 'Foo', last_name: 'Bar')
         get :search, query: '@foobar', format: 'json'
-        response.status.should eql(200)
-        response.body.should eql(user_url(user))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(user_url(user))
       end
 
       it "should respond with nil for an unknown username" do
         get :search, query: '@unknown', format: 'json'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
     end
 
     context "[project]" do
       it "should respond with the URL for a project given a project slug" do
         get :search, query: 'example-project'
-        response.status.should eql(200)
-        response.body.should eql(project_url(@project))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_url(@project))
       end
 
       it "should respond with the URL for a project given a project prefix" do
         get :search, query: 'example-p'
-        response.status.should eql(200)
-        response.body.should eql(project_url(@project))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_url(@project))
       end
 
       it "should respond with nil given an unknown project" do
         get :search, query: 'unknown'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an ambiguous project prefix" do
         get :search, query: 'exam'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
     end
 
     context "[environment]" do
       it "should respond with the URL for an environment given a project & environment slug" do
         get :search, query: 'example-project production'
-        response.status.should eql(200)
-        response.body.should eql(project_environment_bugs_url(@project, @environment))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_environment_bugs_url(@project, @environment))
       end
 
       it "should respond with the URL for an environment given a project & environment prefix" do
         get :search, query: 'example-p product'
-        response.status.should eql(200)
-        response.body.should eql(project_environment_bugs_url(@project, @environment))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_environment_bugs_url(@project, @environment))
       end
 
       it "should respond with nil given an unknown project" do
         get :search, query: 'unknown development'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an unknown environment" do
         get :search, query: 'example-project dev'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an ambiguous project prefix" do
         get :search, query: 'exam production'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an ambiguous environment prefix" do
         get :search, query: 'example-project prod'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
     end
 
     context "[bug]" do
       it "should respond with the URL for a bug given a project & environment slug and bug number" do
         get :search, query: 'example-project production 1'
-        response.status.should eql(200)
-        response.body.should eql(project_environment_bug_url(@project, @environment, @bug))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_environment_bug_url(@project, @environment, @bug))
       end
 
       it "should respond with the URL for a bug given a project & environment prefix and bug number" do
         get :search, query: 'example-p product 1'
-        response.status.should eql(200)
-        response.body.should eql(project_environment_bug_url(@project, @environment, @bug))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_environment_bug_url(@project, @environment, @bug))
       end
 
       it "should respond with nil given an unknown project" do
         get :search, query: 'unknown production 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an unknown environment" do
         get :search, query: 'example-project unknown 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an unknown bug number" do
         get :search, query: 'example-project production 123'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an ambiguous project prefix" do
         get :search, query: 'exam production 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an ambiguous environment prefix" do
         get :search, query: 'example-project prod 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
     end
 
     context "[occurrence]" do
       it "should respond with the URL for an occurrence given a project & environment slug and bug & occurrence number" do
         get :search, query: 'example-project production 1 1'
-        response.status.should eql(200)
-        response.body.should eql(project_environment_bug_occurrence_url(@project, @environment, @bug, @occurrence))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_environment_bug_occurrence_url(@project, @environment, @bug, @occurrence))
       end
 
       it "should respond with the URL for an occurrence given a project & environment prefix and a bug & occurrence number" do
         get :search, query: 'example-p product 1 1'
-        response.status.should eql(200)
-        response.body.should eql(project_environment_bug_occurrence_url(@project, @environment, @bug, @occurrence))
+        expect(response.status).to eql(200)
+        expect(response.body).to eql(project_environment_bug_occurrence_url(@project, @environment, @bug, @occurrence))
       end
 
       it "should respond with nil given an unknown project" do
         get :search, query: 'unknown production 1 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an unknown environment" do
         get :search, query: 'example-project unknown 1 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an unknown occurrence number" do
         get :search, query: 'example-project production 1 2'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an unknown bug number" do
         get :search, query: 'example-project production 2 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an ambiguous project prefix" do
         get :search, query: 'exam production 1 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
 
       it "should respond with nil given an ambiguous environment prefix" do
         get :search, query: 'example-project prod 1 1'
-        response.status.should eql(200)
-        response.body.should be_blank
+        expect(response.status).to eql(200)
+        expect(response.body).to be_blank
       end
     end
   end
@@ -222,35 +216,36 @@
         foo2 = FactoryGirl.create(:user, username: 'foo2', first_name: 'Foo', last_name: 'Two')
 
         get :suggestions, query: '@foo', format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).
-            should eql([
-                           {'user' => JSON.parse(foo1.to_json),
-                            'url'  => user_url(foo1),
-                            'type' => 'user'},
-                           {'user' => JSON.parse(foo2.to_json),
-                            'url'  => user_url(foo2),
-                            'type' => 'user'},
-                       ])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).
+            to eql([
+                       {'user' => JSON.parse(foo1.to_json),
+                        'url'  => user_url(foo1),
+                        'type' => 'user'},
+                       {'user' => JSON.parse(foo2.to_json),
+                        'url'  => user_url(foo2),
+                        'type' => 'user'},
+                   ])
       end
     end
 
     context "[project]" do
       it "should respond with a list of project suggestions" do
+        Project.delete_all
         proj1 = FactoryGirl.create(:project, name: 'Project One')
         proj2 = FactoryGirl.create(:project, name: 'Project Two')
 
         get :suggestions, query: 'proj', format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).
-            should eql([
-                           {'project' => JSON.parse(proj1.to_json),
-                            'url'     => project_url(proj1),
-                            'type'    => 'project'},
-                           {'project' => JSON.parse(proj2.to_json),
-                            'type'    => 'project',
-                            'url'     => project_url(proj2)},
-                       ])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).
+            to eql([
+                       {'project' => JSON.parse(proj1.to_json),
+                        'url'     => project_url(proj1),
+                        'type'    => 'project'},
+                       {'project' => JSON.parse(proj2.to_json),
+                        'type'    => 'project',
+                        'url'     => project_url(proj2)},
+                   ])
       end
     end
 
@@ -261,24 +256,24 @@
         env2 = FactoryGirl.create(:environment, name: 'env2', project: proj)
 
         get :suggestions, query: 'another env', format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).
-            should eql([
-                           {'project'     => JSON.parse(proj.to_json),
-                            'environment' => JSON.parse(env1.to_json),
-                            'type'        => 'environment',
-                            'url'         => project_environment_bugs_url(proj, env1)},
-                           {'project'     => JSON.parse(proj.to_json),
-                            'environment' => JSON.parse(env2.to_json),
-                            'type'        => 'environment',
-                            'url'         => project_environment_bugs_url(proj, env2)},
-                       ])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).
+            to eql([
+                       {'project'     => JSON.parse(proj.to_json),
+                        'environment' => JSON.parse(env1.to_json),
+                        'type'        => 'environment',
+                        'url'         => project_environment_bugs_url(proj, env1)},
+                       {'project'     => JSON.parse(proj.to_json),
+                        'environment' => JSON.parse(env2.to_json),
+                        'type'        => 'environment',
+                        'url'         => project_environment_bugs_url(proj, env2)},
+                   ])
       end
 
       it "should respond with an empty list for an unknown project" do
         get :suggestions, query: 'unknown unknown', format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
     end
 
@@ -287,33 +282,33 @@
 
       it "should respond with the bug" do
         get :suggestions, query: "#{@bug.environment.project.slug} #{@bug.environment.name} #{@bug.number}", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).
-            should eql([
-                           {'project'     => JSON.parse(@bug.environment.project.to_json),
-                            'environment' => JSON.parse(@bug.environment.to_json),
-                            'bug'         => JSON.parse(@bug.to_json),
-                            'type'        => 'bug',
-                            'url'         => project_environment_bug_url(@bug.environment.project, @bug.environment, @bug)},
-                       ])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).
+            to eql([
+                       {'project'     => JSON.parse(@bug.environment.project.to_json),
+                        'environment' => JSON.parse(@bug.environment.to_json),
+                        'bug'         => JSON.parse(@bug.reload.to_json),
+                        'type'        => 'bug',
+                        'url'         => project_environment_bug_url(@bug.environment.project, @bug.environment, @bug)},
+                   ])
       end
 
       it "should respond with an empty list for an unknown project" do
         get :suggestions, query: "unknown #{@bug.environment.name} #{@bug.number}", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
 
       it "should respond with an empty list for an unknown environment" do
         get :suggestions, query: "#{@bug.environment.project.slug} unknown #{@bug.number}", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
 
       it "should respond with an empty list for an unknown bug" do
         get :suggestions, query: "#{@bug.environment.project.slug} #{@bug.environment.name} 123", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
     end
 
@@ -322,47 +317,47 @@
 
       it "should respond with the occurrence" do
         get :suggestions, query: "#{@occurrence.bug.environment.project.slug} #{@occurrence.bug.environment.name} #{@occurrence.bug.number} #{@occurrence.number}", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).
-            should eql([
-                           {'type'        => 'occurrence',
-                            'url'         => project_environment_bug_occurrence_url(@occurrence.bug.environment.project, @occurrence.bug.environment, @occurrence.bug, @occurrence),
-                            'project'     => JSON.parse(@occurrence.bug.environment.project.to_json),
-                            'environment' => JSON.parse(@occurrence.bug.environment.to_json),
-                            'bug'         => JSON.parse(@occurrence.bug.to_json),
-                            'occurrence'  => JSON.parse(@occurrence.to_json)}
-                       ])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).
+            to eql([
+                       {'type'        => 'occurrence',
+                        'url'         => project_environment_bug_occurrence_url(@occurrence.bug.environment.project, @occurrence.bug.environment, @occurrence.bug, @occurrence),
+                        'project'     => JSON.parse(@occurrence.bug.environment.project.to_json),
+                        'environment' => JSON.parse(@occurrence.bug.environment.to_json),
+                        'bug'         => JSON.parse(@occurrence.bug.to_json),
+                        'occurrence'  => JSON.parse(@occurrence.to_json)}
+                   ])
       end
 
       it "should respond with an empty list for an unknown project" do
         get :suggestions, query: "unknown #{@occurrence.bug.environment.name} #{@occurrence.bug.number} #{@occurrence.number}", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
 
       it "should respond with an empty list for an unknown environment" do
         get :suggestions, query: "#{@occurrence.bug.environment.project.slug} unknown #{@occurrence.bug.number} #{@occurrence.number}", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
 
       it "should respond with an empty list for an unknown bug" do
         get :suggestions, query: "#{@occurrence.bug.environment.project.slug} #{@occurrence.bug.environment.name} 123 #{@occurrence.number}", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
 
       it "should respond with an empty list for an unknown occurrence" do
         get :suggestions, query: "#{@occurrence.bug.environment.project.slug} #{@occurrence.bug.environment.name} #{@occurrence.bug.number} 123", format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).should eql([])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body)).to eql([])
       end
     end
 
     it "should respond with an empty list for other queries" do
       get :suggestions, query: 'somethingelse', format: 'json'
-      response.status.should eql(200)
-      JSON.parse(response.body).should eql([])
+      expect(response.status).to eql(200)
+      expect(JSON.parse(response.body)).to eql([])
     end
   end
 end
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index eb23b96b..1529dee3 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe SessionsController do
+RSpec.describe SessionsController, type: :controller do
   before(:all) do
     attrs = Squash::Configuration.authentication.strategy == 'password' ? {password: 'password123'} : {}
     @user = FactoryGirl.create(:user, attrs)
@@ -22,64 +22,65 @@
 
   describe "#create" do
     before :each do
-      @ldap = mock('Net::LDAP', :host= => nil, :port= => nil, :auth => nil)
-      Net::LDAP.stub!(:new).and_return(@ldap)
+      if defined?(Net::LDAP)
+        @ldap = double('Net::LDAP', :host= => nil, :port= => nil, :auth => nil)
+        allow(Net::LDAP).to receive(:new).and_return(@ldap)
+      end
     end
 
     context '[valid credentials]' do
       before :each do
-        @ldap.stub!(:bind).and_return(true)
-        @ldap.stub! :encryption
+        allow(@ldap).to receive(:bind).and_return(true)
+        allow(@ldap).to receive :encryption
 
-        entry = {:givenname => %w(Sancho), :sn => %w(Sample)}
-        entry.stub!(:dn).and_return('some dn')
-        @ldap.stub!(:search).and_yield(entry)
-      end
+        entry = OpenStruct.new(:givenname => %w(Sancho), :sn => %w(Sample), :dn => 'some dn')
+        allow(@ldap).to receive(:search).and_yield(entry)
+      end if defined?(Net::LDAP)
 
       it "should log in a valid username and password" do
         post :create, username: @user.username, password: 'password123'
-        response.should redirect_to(root_url)
-        session[:user_id].should eql(@user.id)
+        expect(response).to redirect_to(root_url)
+        expect(session[:user_id]).to eql(@user.id)
       end
 
       it "should create users that don't exist" do
         post :create, username: 'new-user', password: 'password123'
-        response.should redirect_to(root_url)
-        User.find(session[:user_id]).username.should eql('new-user')
+        expect(response).to redirect_to(root_url)
+        expect(User.find(session[:user_id]).username).to eql('new-user')
       end if Squash::Configuration.authentication.strategy == 'ldap'
 
       it "should redirect a user to :next if in the params" do
         url = project_url(FactoryGirl.create(:project))
         post :create, username: @user.username, password: 'password123', next: url
-        response.should redirect_to(url)
+        expect(response).to redirect_to(url)
       end
 
       it "should use LDAP when creating a user" do
         post :create, username: 'sancho', password: 'password123'
         user = User.find(session[:user_id])
-        user.first_name.should eql('Sancho')
-        user.last_name.should eql('Sample')
+        expect(user.first_name).to eql('Sancho')
+        expect(user.last_name).to eql('Sample')
       end if Squash::Configuration.authentication.strategy == 'ldap'
     end
 
     it "should not log in an invalid username and password" do
-      @ldap.stub!(:bind).and_return(false)
+      allow(@ldap).to receive(:bind).and_return(false) if defined?(Net::LDAP)
       post :create, username: 'username', password: 'wrong'
-      response.should render_template('new')
-      session[:user_id].should be_nil
+      expect(response).to render_template('new')
+      expect(session[:user_id]).to be_nil
     end
 
     # these two are really applicable to LDAP moreso than password auth
     it "should not allow a blank password" do
       post :create, username: 'username'
-      response.should render_template('new')
-      session[:user_id].should be_nil
+      expect(response).to render_template('new')
+      expect(session[:user_id]).to be_nil
     end
 
     it "should not allow a blank username" do
       post :create, password: 'password123'
-      response.should render_template('new')
-      session[:user_id].should be_nil
+      expect(response).to render_template('new')
+      expect(session[:user_id]).to be_nil
     end
   end
 
@@ -87,9 +88,9 @@
     before(:each) { login_as FactoryGirl.create(:user) }
     it "should log out a user" do
       delete :destroy
-      session[:user_id].should be_nil
-      response.should redirect_to(login_url)
-      flash[:notice].should include('logged out')
+      expect(session[:user_id]).to be_nil
+      expect(response).to redirect_to(login_url)
+      expect(flash[:notice]).to include('logged out')
     end
   end
 end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 7dbc4caa..34586cab 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe UsersController do
+RSpec.describe UsersController, type: :controller do
   describe "#index" do
     before :all do
       [Project, User].each &:destroy_all
@@ -25,8 +25,8 @@
 
     it "should require a logged-in user" do
       get :index, format: 'json'
-      response.status.should eql(401)
-      response.body.should be_blank
+      expect(response.status).to eql(401)
+      expect(response.body).to be_blank
     end
 
     context '[authenticated]' do
@@ -34,14 +34,14 @@
 
       it "should return an empty array given no query" do
         get :index, format: 'json'
-        response.status.should eql(200)
-        response.body.should eql('[]')
+        expect(response.status).to eql(200)
+        expect(response.body).to eql('[]')
       end
 
       it "should load the first 10 filtered users sorted by username" do
         get :index, query: 'filter', format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |r| r['username'] }.should eql(@users.map(&:username).sort[0, 10])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |r| r['username'] }).to eql(@users.map(&:username).sort[0, 10])
       end
 
       it "should include membership information when given a project ID" do
@@ -49,16 +49,16 @@
         @users.sort_by(&:username).each_with_index { |user, i| FactoryGirl.create(:membership, project: project, user: user) if i < 5 }
 
         get :index, query: 'filter', format: 'json', project_id: project.to_param
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |r| r['is_member'] }.should eql([true]*5 + [false]*5)
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |r| r['is_member'] }).to eql([true]*5 + [false]*5)
       end
 
       it "should load the next 10 filtered users when given a last parameter" do
         @users.sort_by! &:username
 
         get :index, query: 'filter', last: @users[9].username, format: 'json'
-        response.status.should eql(200)
-        JSON.parse(response.body).map { |r| r['username'] }.should eql(@users.map(&:username).sort[10, 10])
+        expect(response.status).to eql(200)
+        expect(JSON.parse(response.body).map { |r| r['username'] }).to eql(@users.map(&:username).sort[10, 10])
       end
     end
   end
@@ -79,31 +79,31 @@
     if Squash::Configuration.authentication.registration_enabled?
       it "should create the new user" do
         post :create, user: @attrs
-        User.where(username: 'newguy').exists?.should be_true
-        response.should redirect_to(root_url)
+        expect(User.where(username: 'newguy').exists?).to eql(true)
+        expect(response).to redirect_to(root_url)
       end
 
       it "should log the new user in" do
         post :create, user: @attrs
         user = User.find_by_username!('newguy')
-        session[:user_id].should eql(user.id)
+        expect(session[:user_id]).to eql(user.id)
       end
 
       it "should redirect to the :next parameter" do
         post :create, user: @attrs, next: account_url
-        response.should redirect_to(account_url)
+        expect(response).to redirect_to(account_url)
       end
 
       it "should render the login page for invalid attributes" do
         post :create, user: @attrs.merge('password_confirmation' => 'whoops'), next: account_url
-        response.should render_template('sessions/new')
-        assigns(:user).errors[:password].should eql(['didn’t match'])
+        expect(response).to render_template('sessions/new')
+        expect(assigns(:user).errors[:password_confirmation]).to eql(['doesn’t match'])
       end
     else
       it "should not be possible to create a new user" do
         post :create, user: @attrs
-        User.where(username: 'newguy').exists?.should be_false
-        response.should redirect_to(login_url)
+        expect(User.where(username: 'newguy').exists?).to eql(false)
+        expect(response).to redirect_to(login_url)
       end
     end
   end if Squash::Configuration.authentication.strategy == 'password'
diff --git a/spec/factories/blames.rb b/spec/factories/blames.rb
index 2f12fe70..f0a97032 100644
--- a/spec/factories/blames.rb
+++ b/spec/factories/blames.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/bugs.rb b/spec/factories/bugs.rb
index 27ca30ea..8deffcdb 100644
--- a/spec/factories/bugs.rb
+++ b/spec/factories/bugs.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
index 606700b4..1ac9cd71 100644
--- a/spec/factories/comments.rb
+++ b/spec/factories/comments.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/deploys.rb b/spec/factories/deploys.rb
index 2c35ca91..8c6bb3b4 100644
--- a/spec/factories/deploys.rb
+++ b/spec/factories/deploys.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/device_bugs.rb b/spec/factories/device_bugs.rb
index c7bb9146..4feb8f3d 100644
--- a/spec/factories/device_bugs.rb
+++ b/spec/factories/device_bugs.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index 818c52b5..3621d7d4 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb
index f2cf84da..c4256099 100644
--- a/spec/factories/environments.rb
+++ b/spec/factories/environments.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index 13c427c7..628d30c5 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/memberships.rb b/spec/factories/memberships.rb
index 82f6ed29..58553615 100644
--- a/spec/factories/memberships.rb
+++ b/spec/factories/memberships.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/notification_thresholds.rb b/spec/factories/notification_thresholds.rb
index 735a697f..d89fac10 100644
--- a/spec/factories/notification_thresholds.rb
+++ b/spec/factories/notification_thresholds.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/obfuscation_maps.rb b/spec/factories/obfuscation_maps.rb
index 89deb816..4a33c632 100644
--- a/spec/factories/obfuscation_maps.rb
+++ b/spec/factories/obfuscation_maps.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/occurrences.rb b/spec/factories/occurrences.rb
index 847a6379..437070aa 100644
--- a/spec/factories/occurrences.rb
+++ b/spec/factories/occurrences.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 8ebc4cc2..1791c5be 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
   factory :project do
     association :owner, factory: :user
     sequence(:name) { |i| "Project #{i}" }
-    repository_url "git://github.com/RISCfuture/better_caller.git"
+    repository_url 'https://github.com/RISCfuture/better_caller.git'
     filter_paths %w( vendor/ config/initializers/mysql_connection_fix.rb )
     whitelist_paths %w( vendor/plugins/internal )
   end
diff --git a/spec/factories/source_maps.rb b/spec/factories/source_maps.rb
index 9fadc103..b8883f84 100644
--- a/spec/factories/source_maps.rb
+++ b/spec/factories/source_maps.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
   factory :source_map do
     association :environment
     revision '7f9ef6977510b3487483cf834ea02d3e6d7f6f13'
-    map { Squash::Javascript::SourceMap.new }
+    map GemSourceMap::Map.from_json(Rails.root.join('spec', 'fixtures', 'mapping.json').read)
+    from 'hosted'
+    to 'original'
   end
 end
diff --git a/spec/factories/symbolications.rb b/spec/factories/symbolications.rb
index 15aaa6c6..c654f25a 100644
--- a/spec/factories/symbolications.rb
+++ b/spec/factories/symbolications.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/user_events.rb b/spec/factories/user_events.rb
index a7e6d85b..ca3d1e17 100644
--- a/spec/factories/user_events.rb
+++ b/spec/factories/user_events.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 07701759..91f0c3c7 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
     first_name 'Sancho'
     last_name 'Sample'
     if Squash::Configuration.authentication.strategy == 'password'
-      sequence(:email_address) { |i| "email-#{i}@example.com" }
+      sequence(:email_address) { |i| "default-email-#{i}@example.com" }
       password 'correct horse battery staple'
     end
   end
diff --git a/spec/factories/watches.rb b/spec/factories/watches.rb
index f02d17cd..71d73dcb 100644
--- a/spec/factories/watches.rb
+++ b/spec/factories/watches.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
diff --git a/spec/fixtures/mapping.json b/spec/fixtures/mapping.json
new file mode 100644
index 00000000..6130b26b
--- /dev/null
+++ b/spec/fixtures/mapping.json
@@ -0,0 +1,8 @@
+{
+    "version":3,
+    "file":"out.js",
+    "sourceRoot":"/Documents/Projects/SquareSquash/javascript",
+    "sources":["/Documents/Projects/SquareSquash/javascript/vendor/assets/foo.js", "/Documents/Projects/SquareSquash/javascript/vendor/assets/bar.js"],
+    "names":["src", "maps", "are", "fun"],
+    "mappings":"AAgBC,SAAQ,CAAEA"
+}
diff --git a/spec/lib/blamer/cache_spec.rb b/spec/lib/blamer/cache_spec.rb
new file mode 100644
index 00000000..ac4b3746
--- /dev/null
+++ b/spec/lib/blamer/cache_spec.rb
@@ -0,0 +1,98 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'rails_helper'
+
+RSpec.describe Blamer::Cache do
+  describe "#blame" do
+    before(:all) { @project = FactoryGirl.create(:project) }
+    before(:each) { Blame.delete_all }
+
+    it "should return a cached blame result if available" do
+      blame = FactoryGirl.create(:blame, repository_hash: @project.repository_hash, file: 'myfile.rb', line: 100)
+      expect(@project.repo).not_to receive(:blame)
+      commit = double('Git::Object::Commit')
+      expect(@project.repo).to receive(:object).once.with(blame.blamed_revision).and_return(commit)
+      expect(Blamer::Cache.instance.blame(@project, blame.revision, 'myfile.rb', 100)).to eql(commit)
+    end
+
+    it "should fall back to a Git blame operation otherwise" do
+      expect(@project.repo).to receive(:blame).once.with(
+          'file.rb',
+          hash_including(
+              revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
+              start:    3,
+              end:      3
+          )
+      ).and_return([nil, 'bad', 'bad', 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47'])
+      commit = double('Git::Object::Commit', sha: 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
+      expect(@project.repo).to receive(:object).once.with('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47').and_return(commit)
+
+      expect(Blamer::Cache.instance.blame(@project, 'f19641fd13d396fa1b11c595912323cc1c30571d', 'file.rb', 3)).
+          to eql(commit)
+    end
+
+    it "should write the result of the operation for a cache miss" do
+      Blame.delete_all
+      expect(@project.repo).to receive(:blame).once.with(
+          'file.rb',
+          hash_including(
+              revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
+              start:    3,
+              end:      3
+          )
+      ).and_return([nil, 'bad', 'bad', 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47'])
+      commit = double('Git::Object::Commit', sha: 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
+      expect(@project.repo).to receive(:object).once.with('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47').and_return(commit)
+
+      Blamer::Cache.instance.blame @project, 'f19641fd13d396fa1b11c595912323cc1c30571d', 'file.rb', 3
+
+      expect(Blame.for_project(@project).where(
+          revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
+          file:     'file.rb',
+          line:     3
+      ).first.blamed_revision).to eql('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
+    end
+
+    it "should update a Blame's updated_at for a cache hit" do
+      blame  = FactoryGirl.create(:blame, repository_hash: @project.repository_hash, file: 'myfile.rb', line: 100, updated_at: Time.now - 1.day)
+      commit = double('Git::Object::Commit')
+      expect(@project.repo).to receive(:object).once.with(blame.blamed_revision).and_return(commit)
+      Blamer::Cache.instance.blame @project, blame.revision, 'myfile.rb', 100
+      expect { blame.reload }.to change(blame, :updated_at)
+    end
+
+    it "should drop the least recently used Blame when the cache is full" do
+      stub_const 'Blamer::Cache::MAX_ENTRIES', 3
+
+      FactoryGirl.create_list :blame, 4
+      doomed = FactoryGirl.create :blame, updated_at: Time.now - 1.day
+
+      expect(@project.repo).to receive(:blame).once.with(
+          'file.rb',
+          hash_including(
+              revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
+              start:    3,
+              end:      3
+          )
+      ).and_return([nil, 'bad', 'bad', 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47'])
+      commit = double('Git::Object::Commit', sha: 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
+      expect(@project.repo).to receive(:object).once.with('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47').and_return(commit)
+      Blamer::Cache.instance.blame(@project, 'f19641fd13d396fa1b11c595912323cc1c30571d', 'file.rb', 3)
+
+      expect { doomed.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect(Blame.count).to eql(3)
+    end
+  end
+end
diff --git a/spec/lib/blamer_spec.rb b/spec/lib/blamer/recency_spec.rb
similarity index 76%
rename from spec/lib/blamer_spec.rb
rename to spec/lib/blamer/recency_spec.rb
index af7c20be..f6011045 100644
--- a/spec/lib/blamer_spec.rb
+++ b/spec/lib/blamer/recency_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Blamer do
+RSpec.describe Blamer::Recency do
   before :each do
     Project.delete_all
     @project   = FactoryGirl.create(:project)
@@ -36,7 +36,7 @@
                                                                    "line"   => 2,
                                                                    "symbol" => "foo"}]}],
                                     revision:   'abcdef')
-    -> { Blamer.new(@occurrence).find_or_create_bug! }.should raise_error('Need a resolvable commit')
+    expect { Blamer::Recency.new(@occurrence).find_or_create_bug! }.to raise_error('Need a resolvable commit')
   end
 
   it "should resolve duplicate bugs" do
@@ -50,8 +50,8 @@
                                                                    "line"   => 2,
                                                                    "symbol" => "foo"}]}],
                                     revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-    bug         = Blamer.new(@occurrence).find_or_create_bug!
-    bug.should eql(original)
+    bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+    expect(bug).to eql(original)
   end
 
   context "[hosted projects]" do
@@ -64,8 +64,8 @@
                                                                      "line"   => 2,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should eql(@bug)
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).to eql(@bug)
     end
 
     it "should match an existing closed bug in the same environment" do
@@ -78,8 +78,8 @@
                                                                      "line"   => 2,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should eql(@bug)
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).to eql(@bug)
     end
 
     it "should create a new bug if no existing bug could be found" do
@@ -91,10 +91,10 @@
                                                                      "line"   => 3,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should_not eql(@bug)
-      bug.file.should eql('lib/better_caller/extensions.rb')
-      bug.line.should eql(3)
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).not_to eql(@bug)
+      expect(bug.file).to eql('lib/better_caller/extensions.rb')
+      expect(bug.line).to eql(3)
     end
 
     it "should not match an existing bug in a different environment" do
@@ -107,9 +107,9 @@
                                                                                 "line"   => 2,
                                                                                 "symbol" => "foo"}]}],
                                                  revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug                    = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should_not eql(@bug)
-      bug.environment.should eql(@shell_bug.environment)
+      bug                    = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).not_to eql(@bug)
+      expect(bug.environment).to eql(@shell_bug.environment)
     end
 
     it "should not match an existing bug of a different class name" do
@@ -122,9 +122,9 @@
                                                                                "line"   => 2,
                                                                                "symbol" => "foo"}]}],
                                                 revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug                   = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should_not eql(@bug)
-      bug.class_name.should eql('SomeOtherError')
+      bug                   = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).not_to eql(@bug)
+      expect(bug.class_name).to eql('SomeOtherError')
     end
   end
 
@@ -145,9 +145,9 @@
                                                                            "line"   => 2,
                                                                            "symbol" => "foo"}]}],
                                             revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug               = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should eql(@bug)
-      bug.deploy.should eql(@shell_bug.deploy)
+      bug               = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).to eql(@bug)
+      expect(bug.deploy).to eql(@shell_bug.deploy)
     end
 
     it "should match an existing closed bug in the same deploy" do
@@ -161,8 +161,8 @@
                                                                            "line"   => 2,
                                                                            "symbol" => "foo"}]}],
                                             revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug               = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should eql(@bug)
+      bug               = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).to eql(@bug)
     end
 
     it "should otherwise match an existing open bug in another deploy, and advance the deploy ID" do
@@ -175,9 +175,9 @@
                                                                            "line"   => 2,
                                                                            "symbol" => "foo"}]}],
                                             revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug               = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should eql(@bug)
-      bug.deploy.should eql(@shell_bug.deploy)
+      bug               = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).to eql(@bug)
+      expect(bug.deploy).to eql(@shell_bug.deploy)
     end
 
     it "should not otherwise match an existing closed bug" do
@@ -191,9 +191,9 @@
                                                                      "line"   => 2,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.should_not eql(@bug)
-      bug.deploy.should eql(@shell_bug.deploy)
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug).not_to eql(@bug)
+      expect(bug.deploy).to eql(@shell_bug.deploy)
     end
   end
 
@@ -219,10 +219,10 @@
                                                                      "line"   => 27,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.file.should eql('ext/better_caller.c')
-      bug.line.should eql(50)
-      bug.blamed_revision.should eql('7f9ef6977510b3487483cf834ea02d3e6d7f6f13')
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.file).to eql('ext/better_caller.c')
+      expect(bug.line).to eql(50)
+      expect(bug.blamed_revision).to eql('7f9ef6977510b3487483cf834ea02d3e6d7f6f13')
     end
 
     it "should use the topmost file if the backtrace is all library files" do
@@ -240,11 +240,11 @@
                                                                      "line"   => 5,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.file.should eql('/library/file')
-      bug.line.should eql(27)
-      bug.special_file?.should be_false
-      bug.blamed_revision.should be_nil
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.file).to eql('/library/file')
+      expect(bug.line).to eql(27)
+      expect(bug.special_file?).to eql(false)
+      expect(bug.blamed_revision).to be_nil
     end
 
     it "should use the topmost project file if none of the project files have associated commits" do
@@ -262,11 +262,11 @@
                                                                      "line"   => 5,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.file.should eql('fake/project/file')
-      bug.line.should eql(11)
-      bug.special_file?.should be_false
-      bug.blamed_revision.should be_nil
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.file).to eql('fake/project/file')
+      expect(bug.line).to eql(11)
+      expect(bug.special_file?).to eql(false)
+      expect(bug.blamed_revision).to be_nil
     end
 
     it "should set special_file for unsymbolicated bugs" do
@@ -281,10 +281,10 @@
                                                                     {"type"    => "address",
                                                                      "address" => 5}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.file.should eql('0x0000001B')
-      bug.line.should eql(1)
-      bug.special_file?.should be_true
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.file).to eql('0x0000001B')
+      expect(bug.line).to eql(1)
+      expect(bug.special_file?).to eql(true)
     end
 
     it "should set special_file but use the backtrace elements for an obfuscated Java bug" do
@@ -298,10 +298,10 @@
                                                                      "symbol"     => "b",
                                                                      "class_name" => "A"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.file.should eql('A.java')
-      bug.line.should eql(15)
-      bug.special_file?.should be_true
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.file).to eql('A.java')
+      expect(bug.line).to eql(15)
+      expect(bug.special_file?).to eql(true)
     end
 
     it "should abs Java line numbers, which can apparently be negative" do
@@ -315,9 +315,9 @@
                                                                      "symbol"     => "b",
                                                                      "class_name" => "A"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.file.should eql('A.java')
-      bug.line.should eql(15)
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.file).to eql('A.java')
+      expect(bug.line).to eql(15)
     end
   end
 
@@ -332,8 +332,8 @@
                                                                      "line"   => 3,
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug         = Blamer.new(@occurrence).find_or_create_bug!
-      bug.message_template.should eql('Undefined [NUMBER] for #<Object:[ADDRESS]>')
+      bug         = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.message_template).to eql('Undefined [NUMBER] for #<Object:[ADDRESS]>')
     end
 
     it "should use the DB error filters" do
@@ -347,8 +347,8 @@
                                                                                "line"   => 3,
                                                                                "symbol" => "foo"}]}],
                                                 revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
-      bug                   = Blamer.new(@occurrence).find_or_create_bug!
-      bug.message_template.should eql("Cannot drop index '[STRING]': needed in a foreign key")
+      bug                   = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.message_template).to eql("Cannot drop index '[STRING]': needed in a foreign key")
     end
 
     it "should not filter the message if filtering is disabled" do
@@ -362,8 +362,8 @@
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
       @shell_bug.environment.project.update_attribute :disable_message_filtering, true
-      bug = Blamer.new(@occurrence).find_or_create_bug!
-      bug.message_template.should eql('Undefined 123 for #<Object:0x007fedfa0aa920>')
+      bug = Blamer::Recency.new(@occurrence).find_or_create_bug!
+      expect(bug.message_template).to eql('Undefined 123 for #<Object:0x007fedfa0aa920>')
     end
   end
 
@@ -380,16 +380,16 @@
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
 
-      blamer = Blamer.new(@occurrence)
+      blamer = Blamer::Recency.new(@occurrence)
       bug    = blamer.find_or_create_bug!
       blamer.reopen_bug_if_necessary! bug
 
 
-      @bug.reload.should be_fixed
+      expect(@bug.reload).to be_fixed
     end
 
     it "should reopen a fixed and deployed bug" do
-      @bug.update_attributes({fixed: true, fix_deployed: true}, as: :admin)
+      @bug.update_attributes fixed: true, fix_deployed: true
       @occurrence = FactoryGirl.build(:rails_occurrence,
                                       bug:        @shell_bug,
                                       backtraces: [{"name"      => "Thread 0",
@@ -399,11 +399,11 @@
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
 
-      blamer = Blamer.new(@occurrence)
+      blamer = Blamer::Recency.new(@occurrence)
       bug    = blamer.find_or_create_bug!
       blamer.reopen_bug_if_necessary! bug
 
-      @bug.reload.should_not be_fixed
+      expect(@bug.reload).not_to be_fixed
     end
 
     it "should reopen a fixed and stale bug" do
@@ -418,16 +418,16 @@
                                                                      "symbol" => "foo"}]}],
                                       revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
 
-      blamer = Blamer.new(@occurrence)
+      blamer = Blamer::Recency.new(@occurrence)
       bug    = blamer.find_or_create_bug!
       blamer.reopen_bug_if_necessary! bug
 
-      @bug.reload.should_not be_fixed
+      expect(@bug.reload).not_to be_fixed
     end
 
     it "should not reopen a distributed project's bug" do
       deploy = FactoryGirl.create(:deploy, environment: @env)
-      @bug.update_attributes({fixed: true, fix_deployed: true}, as: :admin)
+      @bug.update_attributes fixed: true, fix_deployed: true
       @bug.update_attribute :deploy, deploy
       @shell_bug.deploy = deploy
       @occurrence       = FactoryGirl.build(:rails_occurrence,
@@ -439,97 +439,12 @@
                                                                            "symbol" => "foo"}]}],
                                             revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
 
-      blamer = Blamer.new(@occurrence)
+      blamer = Blamer::Recency.new(@occurrence)
       bug    = blamer.find_or_create_bug!
       blamer.reopen_bug_if_necessary! bug
 
-      @bug.reload.should be_fixed
+      expect(@bug.reload).to be_fixed
     end
   end
 end
 
-describe Blamer::Cache do
-  describe "#blame" do
-    before(:all) { @project = FactoryGirl.create(:project) }
-    before(:each) { Blame.delete_all }
-
-    it "should return a cached blame result if available" do
-      blame = FactoryGirl.create(:blame, repository_hash: @project.repository_hash, file: 'myfile.rb', line: 100)
-      @project.repo.should_not_receive(:blame)
-      commit = mock('Git::Object::Commit')
-      @project.repo.should_receive(:object).once.with(blame.blamed_revision).and_return(commit)
-      Blamer::Cache.instance.blame(@project, blame.revision, 'myfile.rb', 100).should eql(commit)
-    end
-
-    it "should fall back to a Git blame operation otherwise" do
-      @project.repo.should_receive(:blame).once.with(
-          'file.rb',
-          hash_including(
-              revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
-              start:    3,
-              end:      3
-          )
-      ).and_return([nil, 'bad', 'bad', 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47'])
-      commit = mock('Git::Object::Commit', sha: 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
-      @project.repo.should_receive(:object).once.with('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47').and_return(commit)
-
-      Blamer::Cache.instance.blame(@project, 'f19641fd13d396fa1b11c595912323cc1c30571d', 'file.rb', 3).
-          should eql(commit)
-    end
-
-    it "should write the result of the operation for a cache miss" do
-      Blame.delete_all
-      @project.repo.should_receive(:blame).once.with(
-          'file.rb',
-          hash_including(
-              revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
-              start:    3,
-              end:      3
-          )
-      ).and_return([nil, 'bad', 'bad', 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47'])
-      commit = mock('Git::Object::Commit', sha: 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
-      @project.repo.should_receive(:object).once.with('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47').and_return(commit)
-
-      Blamer::Cache.instance.blame @project, 'f19641fd13d396fa1b11c595912323cc1c30571d', 'file.rb', 3
-
-      Blame.for_project(@project).where(
-          revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
-          file:     'file.rb',
-          line:     3
-      ).first.blamed_revision.should eql('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
-    end
-
-    it "should update a Blame's updated_at for a cache hit" do
-      blame  = FactoryGirl.create(:blame, repository_hash: @project.repository_hash, file: 'myfile.rb', line: 100, updated_at: Time.now - 1.day)
-      commit = mock('Git::Object::Commit')
-      @project.repo.should_receive(:object).once.with(blame.blamed_revision).and_return(commit)
-      Blamer::Cache.instance.blame @project, blame.revision, 'myfile.rb', 100
-      -> { blame.reload }.should change(blame, :updated_at)
-    end
-
-    it "should drop the least recently used Blame when the cache is full" do
-      old_max                    = Blamer::Cache::MAX_ENTRIES
-      Blamer::Cache::MAX_ENTRIES = 3
-
-      FactoryGirl.create_list :blame, 4
-      doomed = FactoryGirl.create :blame, updated_at: Time.now - 1.day
-
-      @project.repo.should_receive(:blame).once.with(
-          'file.rb',
-          hash_including(
-              revision: 'f19641fd13d396fa1b11c595912323cc1c30571d',
-              start:    3,
-              end:      3
-          )
-      ).and_return([nil, 'bad', 'bad', 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47'])
-      commit = mock('Git::Object::Commit', sha: 'd1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47')
-      @project.repo.should_receive(:object).once.with('d1500ebf6cd84775f4cd56b73e81aaa1b3fd9c47').and_return(commit)
-      Blamer::Cache.instance.blame(@project, 'f19641fd13d396fa1b11c595912323cc1c30571d', 'file.rb', 3)
-
-      -> { doomed.reload }.should raise_error(ActiveRecord::RecordNotFound)
-      Blame.count.should eql(3)
-
-      Blamer::Cache::MAX_ENTRIES = old_max
-    end
-  end
-end
diff --git a/spec/lib/blamer/simple_spec.rb b/spec/lib/blamer/simple_spec.rb
new file mode 100644
index 00000000..fd720c59
--- /dev/null
+++ b/spec/lib/blamer/simple_spec.rb
@@ -0,0 +1,77 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'rails_helper'
+
+RSpec.describe Blamer::Simple do
+  it "should set the bug's file and line using git-blame" do
+    @project   = FactoryGirl.create(:project)
+    @env       = FactoryGirl.create(:environment, project: @project)
+    @shell_bug = FactoryGirl.build(:bug, environment: @env)
+
+
+    @occurrence = FactoryGirl.build(:rails_occurrence,
+                                    bug:        @shell_bug,
+                                    backtraces: [{"name"      => "Thread 0",
+                                                  "faulted"   => true,
+                                                  "backtrace" => [{"file"   => "/library/file",
+                                                                   "line"   => 10,
+                                                                   "symbol" => "foo"},
+                                                                  {"file"   => "ext/better_caller.c",
+                                                                   "line"   => 50,
+                                                                   "symbol" => "foo"},
+                                                                  {"file"   => "ext/better_caller.c",
+                                                                   "line"   => 46,
+                                                                   "symbol" => "foo"},
+                                                                  {"file"   => "ext/better_caller.c",
+                                                                   "line"   => 31,
+                                                                   "symbol" => "foo"},
+                                                                  {"file"   => "ext/better_caller.c",
+                                                                   "line"   => 27,
+                                                                   "symbol" => "foo"}]}],
+                                    revision:   '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
+    bug         = Blamer::Simple.new(@occurrence).find_or_create_bug!
+    expect(bug.file).to eql('[S] 10e95a0abb419d791a30d5dd0fe163b6f1c2bbf1e10ef0a303f3315cd149bcc5')
+    expect(bug.special_file?).to eql(true)
+    expect(bug.line).to eql(1)
+    expect(bug.blamed_revision).to be_nil
+  end
+
+  it "should not touch the Git repo at all when processing an occurrence" do
+    Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+    @project   = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
+    @commit    = @project.repo.object('HEAD^')
+
+    # this will be a valid exception but with a stack trace that doesn't make
+    # sense in the context of the project (the files don't actually exist in the
+    # repo). this will test the scenarios where no blamed commits can be found.
+    @exception = nil
+    begin
+      raise ArgumentError, "Well crap"
+    rescue
+      @exception = $!
+    end
+    @line        = @exception.backtrace.first.split(':')[1].to_i # get the line number of the first line of the backtrace
+
+    Bug.delete_all
+    @params = Squash::Ruby.send(:exception_info_hash, @exception, Time.now, {}, nil)
+    @params.merge!('api_key'     => @project.api_key,
+                   'environment' => 'production',
+                   'revision'    => @commit.sha,
+                   'user_data'   => {'foo' => 'bar'})
+
+    expect(@project).not_to receive :repo
+    OccurrencesWorker.new(@params).perform
+  end
+end
diff --git a/spec/lib/composite_primary_keys_spec.rb b/spec/lib/composite_primary_keys_spec.rb
index daf9a3f8..daec484e 100644
--- a/spec/lib/composite_primary_keys_spec.rb
+++ b/spec/lib/composite_primary_keys_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,18 +12,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe ActiveRecord::Base do
+RSpec.describe ActiveRecord::Base do
   describe "#touch" do
     it "should update a single-key record" do
       user = FactoryGirl.create(:user, created_at: 1.day.ago, updated_at: 1.day.ago)
-      -> { user.touch.should be_true }.should change(user, :updated_at)
+      expect { expect(user.touch).to eql(true) }.to change(user, :updated_at)
     end
 
     it "should update a multi-key record" do
       nt = FactoryGirl.create(:notification_threshold, last_tripped_at: 1.day.ago)
-      -> { nt.touch(:last_tripped_at).should be_true }.should change(nt, :last_tripped_at)
+      expect { expect(nt.touch(:last_tripped_at)).to eql(true) }.to change(nt, :last_tripped_at)
     end
   end
 end
diff --git a/spec/lib/find_in_batches_spec.rb b/spec/lib/find_in_batches_spec.rb
index 518e60bc..b2aca497 100644
--- a/spec/lib/find_in_batches_spec.rb
+++ b/spec/lib/find_in_batches_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe "ActiveRecord::Base.find_in_batches" do
+RSpec.describe "ActiveRecord::Base.find_in_batches" do
   context "[single surrogate key]" do
     before :all do
       Project.delete_all; User.delete_all
@@ -25,29 +25,29 @@
 
     it "should yield all records for lists < batch size" do
       User.find_in_batches(batch_size: 100) { |batch| @batches << batch }
-      @batches.size.should eql(1)
-      @batches.first.map(&:id).should eql(@users.flatten.map(&:id))
+      expect(@batches.size).to eql(1)
+      expect(@batches.first.map(&:id)).to eql(@users.flatten.map(&:id))
     end
 
     it "should yield all records for lists = batch size" do
       User.find_in_batches(batch_size: 48) { |batch| @batches << batch }
-      @batches.size.should eql(1)
-      @batches.first.map(&:id).should eql(@users.flatten.map(&:id))
+      expect(@batches.size).to eql(1)
+      expect(@batches.first.map(&:id)).to eql(@users.flatten.map(&:id))
     end
 
     it "should yield groups of records for lists > batch size" do
       User.find_in_batches(batch_size: 10) { |batch| @batches << batch }
-      @batches.size.should eql(5)
+      expect(@batches.size).to eql(5)
       @batches.zip(@users).each do |(batch, users)|
-        batch.map(&:id).should eql(users.map(&:id))
+        expect(batch.map(&:id)).to eql(users.map(&:id))
       end
     end
 
     it "should allow a custom start" do
       User.find_in_batches(batch_size: 10, start: @users.flatten[21].id) { |batch| @batches << batch }
-      @batches.size.should eql(3)
+      expect(@batches.size).to eql(3)
       @batches.zip(@users.flatten[21..-1].in_groups_of(10, false)).each do |(batch, users)|
-        batch.map(&:id).should eql(users.map(&:id))
+        expect(batch.map(&:id)).to eql(users.map(&:id))
       end
     end
   end
@@ -57,37 +57,37 @@
       Membership.delete_all
       project = FactoryGirl.create(:project)
       FactoryGirl.create_list(:membership, 47, project: project)
-      @memberships = Membership.order(Membership.scoped.send(:batch_order)).in_groups_of(10, false) # get project owner membership
+      @memberships = Membership.order(Membership.all.send(:batch_order)).in_groups_of(10, false) # get project owner membership
     end
 
     before(:each) { @batches = [] }
 
     it "should yield all records for lists < batch size" do
       Membership.find_in_batches(batch_size: 100) { |batch| @batches << batch }
-      @batches.size.should eql(1)
-      @batches.first.map { |m| [m.user_id, m.project_id] }.should eql(@memberships.flatten.map { |m| [m.user_id, m.project_id] })
+      expect(@batches.size).to eql(1)
+      expect(@batches.first.map { |m| [m.user_id, m.project_id] }).to eql(@memberships.flatten.map { |m| [m.user_id, m.project_id] })
     end
 
     it "should yield all records for lists = batch size" do
       Membership.find_in_batches(batch_size: 48) { |batch| @batches << batch }
-      @batches.size.should eql(1)
-      @batches.first.map { |m| [m.user_id, m.project_id] }.should eql(@memberships.flatten.map { |m| [m.user_id, m.project_id] })
+      expect(@batches.size).to eql(1)
+      expect(@batches.first.map { |m| [m.user_id, m.project_id] }).to eql(@memberships.flatten.map { |m| [m.user_id, m.project_id] })
     end
 
     it "should yield groups of records for lists > batch size" do
       Membership.find_in_batches(batch_size: 10) { |batch| @batches << batch }
-      @batches.size.should eql(5)
+      expect(@batches.size).to eql(5)
       @batches.zip(@memberships).each do |(batch, memberships)|
-        batch.map { |m| [m.user_id, m.project_id] }.should eql(memberships.map { |m| [m.user_id, m.project_id] })
+        expect(batch.map { |m| [m.user_id, m.project_id] }).to eql(memberships.map { |m| [m.user_id, m.project_id] })
       end
     end
 
     it "should allow a custom start" do
       start = @memberships.flatten[21].attributes.slice('user_id', 'project_id').values
       Membership.find_in_batches(batch_size: 10, start: start) { |batch| @batches << batch }
-      @batches.size.should eql(3)
+      expect(@batches.size).to eql(3)
       @batches.zip(@memberships.flatten[21..-1].in_groups_of(10, false)).each do |(batch, memberships)|
-        batch.map { |m| [m.user_id, m.project_id] }.should eql(memberships.map { |m| [m.user_id, m.project_id] })
+        expect(batch.map { |m| [m.user_id, m.project_id] }).to eql(memberships.map { |m| [m.user_id, m.project_id] })
       end
     end
   end
diff --git a/spec/lib/known_revision_validator_spec.rb b/spec/lib/known_revision_validator_spec.rb
index 046f2a86..ffec809b 100644
--- a/spec/lib/known_revision_validator_spec.rb
+++ b/spec/lib/known_revision_validator_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe KnownRevisionValidator do
+RSpec.describe KnownRevisionValidator do
   before :all do
     env    = FactoryGirl.create(:environment)
     @model = FactoryGirl.build(:deploy, environment: env)
@@ -22,48 +22,48 @@
 
   it "should not accept unknown revisions" do
     @model.revision = '3dc20c984283bede1f45863b8f3b4dd9b5b554cc'
-    @model.should_not be_valid
-    @model.errors[:revision].should eql(['does not exist in the repository'])
+    expect(@model).not_to be_valid
+    expect(@model.errors[:revision]).to eql(['does not exist in the repository'])
   end
 
   it "should accept known revisions" do
     @model.revision = '2dc20c984283bede1f45863b8f3b4dd9b5b554cc'
-    @model.should be_valid
+    expect(@model).to be_valid
   end
 
   it "should normalize known revisions" do
     @model.revision = 'HEAD'
-    @model.should be_valid
-    @model.revision.should =~ /^[0-9a-f]{40}$/
+    expect(@model).to be_valid
+    expect(@model.revision).to match(/^[0-9a-f]{40}$/)
   end
 
   context "[:repo option]" do
     before :each do
-      @model  = mock('Model', :foo= => nil)
-      @commit = mock('Git::Object::Commit', sha: '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
+      @model  = double('Model', :foo= => nil)
+      @commit = double('Git::Object::Commit', sha: '2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
     end
 
     it "should accept repository objects" do
-      repo = mock('Git::Repository', fetch: nil)
-      repo.should_receive(:object).once.and_return(@commit)
+      repo = double('Git::Repository', fetch: nil)
+      expect(repo).to receive(:object).once.and_return(@commit)
 
       validator = KnownRevisionValidator.new(repo: repo, attributes: [:foo])
       validator.validate_each(@model, :foo, 'HEAD')
     end
 
     it "should accept method names" do
-      repo = mock('Git::Repository', fetch: nil)
-      repo.should_receive(:object).once.and_return(@commit)
-      @model.stub!(:repo).and_return(repo)
+      repo = double('Git::Repository', fetch: nil)
+      expect(repo).to receive(:object).once.and_return(@commit)
+      allow(@model).to receive(:repo).and_return(repo)
 
       validator = KnownRevisionValidator.new(repo: :repo, attributes: [:foo])
       validator.validate_each(@model, :foo, 'HEAD')
     end
 
     it "should accept procs" do
-      repo = mock('Git::Repository', fetch: nil)
-      repo.should_receive(:object).once.and_return(@commit)
-      @model.stub!(:repo).and_return(repo)
+      repo = double('Git::Repository', fetch: nil)
+      expect(repo).to receive(:object).once.and_return(@commit)
+      allow(@model).to receive(:repo).and_return(repo)
 
       validator = KnownRevisionValidator.new(repo: ->(m) { m.repo }, attributes: [:foo])
       validator.validate_each(@model, :foo, 'HEAD')
diff --git a/spec/lib/message_template_matcher_spec.rb b/spec/lib/message_template_matcher_spec.rb
index ba30351d..39a1407a 100644
--- a/spec/lib/message_template_matcher_spec.rb
+++ b/spec/lib/message_template_matcher_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe MessageTemplateMatcher do
+RSpec.describe MessageTemplateMatcher do
   before :all do
     @mysql_error = <<-ERR.strip
       Duplicate entry 'foo@example.com' for key 'index_users_on_email': UPDATE `users` SET `name` = 'Sancho Sample', `crypted_password` = '349857346384697346', `updated_at` = '2012-09-23 21:18:37', `email` = 'foo@example.com' WHERE `id` = 123456 -- app/controllers/api/v1/user_controller.rb:35
@@ -32,33 +32,33 @@
 
   describe "#matched_substring" do
     it "should remove the query from an error message" do
-      MessageTemplateMatcher.instance.matched_substring('Mysql::Error', @mysql_error).should eql("Duplicate entry 'foo@example.com' for key 'index_users_on_email'")
+      expect(MessageTemplateMatcher.instance.matched_substring('Mysql::Error', @mysql_error)).to eql("Duplicate entry 'foo@example.com' for key 'index_users_on_email'")
     end
 
     it "should return the original message if no match was found" do
-      MessageTemplateMatcher.instance.matched_substring('SomeError', @mysql_error).should eql(@mysql_error)
-      MessageTemplateMatcher.instance.matched_substring('Mysql::Error', 'foobar').should eql('foobar')
+      expect(MessageTemplateMatcher.instance.matched_substring('SomeError', @mysql_error)).to eql(@mysql_error)
+      expect(MessageTemplateMatcher.instance.matched_substring('Mysql::Error', 'foobar')).to eql('foobar')
     end
 
     it "should use references to other error types" do
-      MessageTemplateMatcher.instance.matched_substring('ActiveRecord::JDBCError', 'ERROR: ' + @mysql_error).should eql("Duplicate entry 'foo@example.com' for key 'index_users_on_email'")
-      MessageTemplateMatcher.instance.matched_substring('ActiveRecord::JDBCError', 'ERROR: ' + @pg_error).should eql('ERROR: relation "users" does not exist')
+      expect(MessageTemplateMatcher.instance.matched_substring('ActiveRecord::JDBCError', 'ERROR: ' + @mysql_error)).to eql("Duplicate entry 'foo@example.com' for key 'index_users_on_email'")
+      expect(MessageTemplateMatcher.instance.matched_substring('ActiveRecord::JDBCError', 'ERROR: ' + @pg_error)).to eql('ERROR: relation "users" does not exist')
     end
   end
 
   describe "#sanitized_message" do
     it "should filter the error message" do
-      MessageTemplateMatcher.instance.sanitized_message('Mysql::Error', @mysql_error).should eql("Duplicate entry '[STRING]' for key '[STRING]'")
+      expect(MessageTemplateMatcher.instance.sanitized_message('Mysql::Error', @mysql_error)).to eql("Duplicate entry '[STRING]' for key '[STRING]'")
     end
 
     it "should return nil if no match was found" do
-      MessageTemplateMatcher.instance.sanitized_message('SomeError', @mysql_error).should be_nil
-      MessageTemplateMatcher.instance.sanitized_message('Mysql::Error', 'foobar').should be_nil
+      expect(MessageTemplateMatcher.instance.sanitized_message('SomeError', @mysql_error)).to be_nil
+      expect(MessageTemplateMatcher.instance.sanitized_message('Mysql::Error', 'foobar')).to be_nil
     end
 
     it "should use references to other error types" do
-      MessageTemplateMatcher.instance.sanitized_message('ActiveRecord::JDBCError', 'ERROR: ' + @mysql_error).should eql("Duplicate entry '[STRING]' for key '[STRING]'")
-      MessageTemplateMatcher.instance.sanitized_message('ActiveRecord::JDBCError', 'ERROR: ' + @pg_error).should eql('[STRING] [STRING] does not exist')
+      expect(MessageTemplateMatcher.instance.sanitized_message('ActiveRecord::JDBCError', 'ERROR: ' + @mysql_error)).to eql("Duplicate entry '[STRING]' for key '[STRING]'")
+      expect(MessageTemplateMatcher.instance.sanitized_message('ActiveRecord::JDBCError', 'ERROR: ' + @pg_error)).to eql('[STRING] [STRING] does not exist')
     end
   end
 end
diff --git a/spec/lib/multithread_spec.rb b/spec/lib/multithread_spec.rb
index 981a591f..9a0118f8 100644
--- a/spec/lib/multithread_spec.rb
+++ b/spec/lib/multithread_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Multithread::PriorityQueue do
+RSpec.describe Multithread::PriorityQueue do
   before(:each) { @queue = Multithread::PriorityQueue.new(50, 10) }
 
   describe "#deq" do
@@ -24,30 +24,30 @@
       @queue.enq('10:2', 10) { 10 }
       @queue.enq('20', 20) { 20 }
 
-      @queue.deq(false).().should eql(50)
-      @queue.deq(false).().should eql(20)
-      @queue.deq(false).().should eql(10)
-      @queue.deq(false).().should eql(10)
-      -> { @queue.deq(false) }.should raise_error(ThreadError)
+      expect(@queue.deq(false).()).to eql(50)
+      expect(@queue.deq(false).()).to eql(20)
+      expect(@queue.deq(false).()).to eql(10)
+      expect(@queue.deq(false).()).to eql(10)
+      expect { @queue.deq(false) }.to raise_error(ThreadError)
     end
 
     it "should raise if the queue is empty" do
-      @queue.should be_empty
-      -> { @queue.deq(false) }.should raise_error(ThreadError)
+      expect(@queue).to be_empty
+      expect { @queue.deq(false) }.to raise_error(ThreadError)
     end
   end
 
   describe "#enq" do
     it "should let low-priority jobs fall off if saturated" do
       10.times { |i| @queue.enq(i.to_s, 50) { 50 } }
-      @queue.should be_saturated
+      expect(@queue).to be_saturated
 
       @queue.enq('new1', 10) { 10 }
-      @queue.size.should eql(10)
+      expect(@queue.size).to eql(10)
 
       @queue.enq('new2', 50) { 50 }
-      @queue.size.should eql(11)
-      @queue.should be_saturated
+      expect(@queue.size).to eql(11)
+      expect(@queue).to be_saturated
     end
 
     it "should not enqueue multiple copies of the same job" do
@@ -56,10 +56,10 @@
       @queue.enq('10', 10) { 10 }
       @queue.enq('20', 20) { 20 }
 
-      @queue.size.should eql(3)
-      @queue.deq(false).().should eql(50)
-      @queue.deq(false).().should eql(20)
-      @queue.deq(false).().should eql(10)
+      expect(@queue.size).to eql(3)
+      expect(@queue.deq(false).()).to eql(50)
+      expect(@queue.deq(false).()).to eql(20)
+      expect(@queue.deq(false).()).to eql(10)
     end
   end
 end
diff --git a/spec/lib/service/jira_spec.rb b/spec/lib/service/jira_spec.rb
index 61c2f32a..7f48c600 100644
--- a/spec/lib/service/jira_spec.rb
+++ b/spec/lib/service/jira_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,13 +12,13 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Service::JIRA do
+RSpec.describe Service::JIRA do
   describe ".new_issue_link" do
     it "should return a proper issue link" do
-      Service::JIRA.new_issue_link(foo: 'bar').
-          should eql(Squash::Configuration.jira.api_host +
+      expect(Service::JIRA.new_issue_link(foo: 'bar')).
+          to eql(Squash::Configuration.jira.api_host +
                          Squash::Configuration.jira.api_root +
                          Squash::Configuration.jira.create_issue_details +
                          '?foo=bar'
@@ -33,8 +33,8 @@
                            response: Rails.root.join('spec', 'fixtures', 'jira_issue.json')
 
       issue = Service::JIRA.issue('FOO-123')
-      issue.key.should eql('FOO-123')
-      issue.summary.should eql("Double RTs on coffee bar Twitter monitor")
+      expect(issue.key).to eql('FOO-123')
+      expect(issue.summary).to eql("Double RTs on coffee bar Twitter monitor")
     end
 
     it "should return nil for an unknown issue" do
@@ -42,7 +42,7 @@
                            jira_url("/rest/api/2/issue/FOO-124"),
                            response: Rails.root.join('spec', 'fixtures', 'jira_issue_404.json')
 
-      Service::JIRA.issue('FOO-124').should be_nil
+      expect(Service::JIRA.issue('FOO-124')).to be_nil
     end
   end
 
@@ -53,8 +53,8 @@
                            response: Rails.root.join('spec', 'fixtures', 'jira_statuses.json')
 
       statuses = Service::JIRA.statuses
-      statuses.map(&:name).
-          should eql(["Open", "In Progress", "Reopened", "Resolved", "Closed",
+      expect(statuses.map(&:name)).
+          to eql(["Open", "In Progress", "Reopened", "Resolved", "Closed",
                       "Needs Review", "Approved", "Hold Pending Info", "IceBox",
                       "Not Yet Started", "Started", "Finished", "Delivered",
                       "Accepted", "Rejected", "Allocated", "Build", "Verify",
@@ -69,8 +69,8 @@
                            response: Rails.root.join('spec', 'fixtures', 'jira_projects.json')
 
       projects = Service::JIRA.projects
-      projects.map(&:name).
-          should eql(["Alert", "Android", "Bugs", "Business Intelligence",
+      expect(projects.map(&:name)).
+          to eql(["Alert", "Android", "Bugs", "Business Intelligence",
                       "Checker", "Coffee Bar", "Compliance"])
     end
   end
diff --git a/spec/lib/service/pager_duty_spec.rb b/spec/lib/service/pager_duty_spec.rb
index e4af1835..2f0299c8 100644
--- a/spec/lib/service/pager_duty_spec.rb
+++ b/spec/lib/service/pager_duty_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Service::PagerDuty do
+RSpec.describe Service::PagerDuty do
   before :each do
     @pagerduty = Service::PagerDuty.new('abc123')
     FakeWeb.register_uri :post,
@@ -32,30 +32,30 @@
                  when 'token' then /^Token token=/
                  when 'basic' then /^Basic /
                end
-        FakeWeb.last_request['Authorization'].should =~ auth
-        FakeWeb.last_request['Content-Type'].should eql('application/json')
+        expect(FakeWeb.last_request['Authorization']).to match(auth)
+        expect(FakeWeb.last_request['Content-Type']).to eql('application/json')
       end
 
       it "should parse the response" do
         resp = @pagerduty.send(method, 'abc123')
-        resp.http_status.should eql(200)
-        resp.should be_success
-        resp.attributes.should eql('status' => 'success', 'message' => 'You did it!')
-        resp.status.should eql('success')
+        expect(resp.http_status).to eql(200)
+        expect(resp).to be_success
+        expect(resp.attributes).to eql('status' => 'success', 'message' => 'You did it!')
+        expect(resp.status).to eql('success')
       end
 
       it "should use an HTTP proxy if configured" do
         Squash::Configuration.pagerduty[:http_proxy] = Configoro::Hash.new('host' => 'myhost', 'port' => 123)
         http = Net::HTTP
         proxy = Net::HTTP::Proxy(nil, nil, nil, nil)
-        Net::HTTP.should_receive(:Proxy).once.with('myhost', 123).and_return(http)
-        Net::HTTP.should_receive(:Proxy).once.with(nil, nil, nil, nil).and_return(proxy)
+        expect(Net::HTTP).to receive(:Proxy).once.with('myhost', 123).and_return(http)
+        allow(Net::HTTP).to receive(:Proxy).and_return(proxy)
 
         resp = @pagerduty.send(method, 'abc123')
-        resp.http_status.should eql(200)
-        resp.should be_success
-        resp.attributes.should eql('status' => 'success', 'message' => 'You did it!')
-        resp.status.should eql('success')
+        expect(resp.http_status).to eql(200)
+        expect(resp).to be_success
+        expect(resp.attributes).to eql('status' => 'success', 'message' => 'You did it!')
+        expect(resp.status).to eql('success')
 
         Squash::Configuration.pagerduty.delete :http_proxy
       end
@@ -66,9 +66,9 @@
     it "should send a trigger event" do
       @pagerduty.trigger 'foobar'
       body = JSON.parse(FakeWeb.last_request.body)
-      body['service_key'].should eql('abc123')
-      body['event_type'].should eql('trigger')
-      body['description'].should eql('foobar')
+      expect(body['service_key']).to eql('abc123')
+      expect(body['event_type']).to eql('trigger')
+      expect(body['description']).to eql('foobar')
     end
   end
 
@@ -76,9 +76,9 @@
     it "should send an acknowledge event" do
       @pagerduty.acknowledge 'foobar'
       body = JSON.parse(FakeWeb.last_request.body)
-      body['service_key'].should eql('abc123')
-      body['event_type'].should eql('acknowledge')
-      body['incident_key'].should eql('foobar')
+      expect(body['service_key']).to eql('abc123')
+      expect(body['event_type']).to eql('acknowledge')
+      expect(body['incident_key']).to eql('foobar')
     end
   end
 
@@ -86,9 +86,9 @@
     it "should send a resolve event" do
       @pagerduty.resolve 'foobar'
       body = JSON.parse(FakeWeb.last_request.body)
-      body['service_key'].should eql('abc123')
-      body['event_type'].should eql('resolve')
-      body['incident_key'].should eql('foobar')
+      expect(body['service_key']).to eql('abc123')
+      expect(body['event_type']).to eql('resolve')
+      expect(body['incident_key']).to eql('foobar')
     end
   end
 end unless Squash::Configuration.pagerduty.disabled?
diff --git a/spec/lib/workers/deploy_fix_marker_spec.rb b/spec/lib/workers/deploy_fix_marker_spec.rb
index f78a5904..53554226 100644
--- a/spec/lib/workers/deploy_fix_marker_spec.rb
+++ b/spec/lib/workers/deploy_fix_marker_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,16 +12,16 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe DeployFixMarker do
+RSpec.describe DeployFixMarker do
   it "should raise an error if the deploy cannot be found" do
-    -> { DeployFixMarker.perform 0 }.should raise_error(ActiveRecord::RecordNotFound)
+    expect { DeployFixMarker.perform 0 }.to raise_error(ActiveRecord::RecordNotFound)
   end
 
   it "should mark the appropriate bugs as fix_deployed" do
-    Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-    project = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+    Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+    project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
     env     = FactoryGirl.create(:environment, project: project)
     deploy  = FactoryGirl.build(:deploy, environment: env, revision: env.project.repo.object('HEAD^').sha)
 
@@ -33,14 +33,14 @@
     deploy.save!
     DeployFixMarker.perform deploy.id
 
-    bug_in_range_not_fixed.reload.fix_deployed?.should be_false
-    bug_in_range_fixed_not_deployed.reload.fix_deployed?.should be_true
-    bug_not_in_range_fixed_not_deployed.reload.fix_deployed?.should be_false
+    expect(bug_in_range_not_fixed.reload.fix_deployed?).to eql(false)
+    expect(bug_in_range_fixed_not_deployed.reload.fix_deployed?).to eql(true)
+    expect(bug_not_in_range_fixed_not_deployed.reload.fix_deployed?).to eql(false)
   end
 
   it "should create events for the fixed bugs" do
-    Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-    project = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+    Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+    project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
     env    = FactoryGirl.create(:environment, project: project)
     deploy = FactoryGirl.build(:deploy, environment: env, revision: project.repo.object('HEAD^').sha)
     bug    = FactoryGirl.create(:bug, environment: env, resolution_revision: project.repo.object('HEAD^^').sha, fixed: true)
@@ -49,8 +49,8 @@
     deploy.save!
     DeployFixMarker.perform deploy.id
 
-    bug.events(true).count.should eql(1)
-    bug.events.first.kind.should eql('deploy')
-    bug.events.first.data['revision'].should eql(deploy.revision)
+    expect(bug.events(true).count).to eql(1)
+    expect(bug.events.first.kind).to eql('deploy')
+    expect(bug.events.first.data['revision']).to eql(deploy.revision)
   end
 end
diff --git a/spec/lib/workers/jira_status_updater_spec.rb b/spec/lib/workers/jira_status_updater_spec.rb
index 98d276bd..e745a9c9 100644
--- a/spec/lib/workers/jira_status_updater_spec.rb
+++ b/spec/lib/workers/jira_status_updater_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe JiraStatusWorker do
+RSpec.describe JiraStatusWorker do
   describe "#perform" do
     it "should update bugs linked to newly-closed JIRA tickets" do
       FakeWeb.register_uri :get,
@@ -41,12 +41,12 @@
 
       JiraStatusWorker.perform
 
-      linked_bugs.each { |bug| bug.reload.should be_fixed }
-      unlinked_bugs.each { |bug| bug.reload.should_not be_fixed }
+      linked_bugs.each { |bug| expect(bug.reload).to be_fixed }
+      unlinked_bugs.each { |bug| expect(bug.reload).not_to be_fixed }
 
-      linked_bugs.first.events.last.kind.should eql('close')
-      linked_bugs.first.events.last.data['issue'].should eql('FOO-123')
-      linked_bugs.first.events.last.user.should be_nil
+      expect(linked_bugs.first.events.last.kind).to eql('close')
+      expect(linked_bugs.first.events.last.data['issue']).to eql('FOO-123')
+      expect(linked_bugs.first.events.last.user).to be_nil
     end
   end
-end
+end unless Squash::Configuration.jira.disabled?
diff --git a/spec/lib/workers/occurrences_worker_spec.rb b/spec/lib/workers/occurrences_worker_spec.rb
index f61544db..a49b8b2d 100644
--- a/spec/lib/workers/occurrences_worker_spec.rb
+++ b/spec/lib/workers/occurrences_worker_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,19 +12,19 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
 THIS_FILE = Pathname.new(__FILE__).relative_path_from(Rails.root).to_s
 
-describe OccurrencesWorker do
+RSpec.describe OccurrencesWorker do
   before :all do
-    Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-    @project   = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+    Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+    @project   = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
     @commit    = @project.repo.object('HEAD^')
 
     # this will be a valid exception but with a stack trace that doesn't make
     # sense in the context of the project (the files don't actually exist in the
-                                                                 # repo). this will test the scenarios where no blamed commits can be found.
+    # repo). this will test the scenarios where no blamed commits can be found.
     @exception = nil
     begin
       raise ArgumentError, "Well crap"
@@ -60,27 +60,27 @@
   describe "#initialize" do
     OccurrencesWorker::REQUIRED_KEYS.each do |key|
       it "should require the #{key} key" do
-        -> { OccurrencesWorker.new @params.except(key) }.should raise_error(API::InvalidAttributesError)
-        -> { OccurrencesWorker.new @params.merge(key => ' ') }.should raise_error(API::InvalidAttributesError)
+        expect { OccurrencesWorker.new @params.except(key) }.to raise_error(API::InvalidAttributesError)
+        expect { OccurrencesWorker.new @params.merge(key => ' ') }.to raise_error(API::InvalidAttributesError)
       end
     end
 
     it "should raise an error if the API key is invalid" do
-      -> { OccurrencesWorker.new @params.merge('api_key' => 'not-found') }.should raise_error(API::UnknownAPIKeyError)
+      expect { OccurrencesWorker.new @params.merge('api_key' => 'not-found') }.to raise_error(API::UnknownAPIKeyError)
     end
 
     it "should create a new environment if one doesn't exist with that name" do
       @project.environments.delete_all
       OccurrencesWorker.new(@params).perform
-      @project.environments.pluck(:name).should eql(%w( production ))
+      expect(@project.environments.pluck(:name)).to eql(%w( production ))
     end
   end
 
   describe "#perform" do
     it "attempt to git-fetch if the revision doesn't exist, then skip it if the revision STILL doesn't exist" do
-      Project.stub!(:find_by_api_key!).and_return(@project)
-      @project.repo.should_receive(:fetch).once
-      -> { OccurrencesWorker.new(@params.merge('revision' => '10b04c1ed63bec207db6ebdf14d31d2a86006cb4')).perform }.should raise_error(/Unknown revision/)
+      allow(Project).to receive(:find_by_api_key!).and_return(@project)
+      expect(@project.repo).to receive(:fetch).once
+      expect { OccurrencesWorker.new(@params.merge('revision' => '10b04c1ed63bec207db6ebdf14d31d2a86006cb4')).perform }.to raise_error(/Unknown revision/)
     end
 
     context "[finding Deploys and revisions]" do
@@ -88,70 +88,113 @@
         env    = FactoryGirl.create(:environment, name: 'production', project: @project)
         deploy = FactoryGirl.create(:deploy, environment: env, build: '12345')
         occ    = OccurrencesWorker.new(@params.merge('build' => '12345')).perform
-        occ.bug.deploy.should eql(deploy)
+        expect(occ.bug.deploy).to eql(deploy)
       end
 
       it "should create a new Deploy if one doesn't exist and a revision is given" do
         Deploy.delete_all
         occ = OccurrencesWorker.new(@params.merge('build' => 'new')).perform
-        occ.bug.deploy.revision.should eql(@commit.sha)
-        occ.bug.deploy.deployed_at.should be_within(5).of(Time.now)
-        occ.bug.deploy.build.should eql('new')
+        expect(occ.bug.deploy.revision).to eql(@commit.sha)
+        expect(occ.bug.deploy.deployed_at).to be_within(1.minute).of(Time.now)
+        expect(occ.bug.deploy.build).to eql('new')
       end
 
       it "should raise an error if the Deploy doesn't exist and no revision is given" do
-        -> { OccurrencesWorker.new(@params.merge('build' => 'not-found', 'revision' => nil)).perform }.
-            should raise_error(API::InvalidAttributesError)
+        expect { OccurrencesWorker.new(@params.merge('build' => 'not-found', 'revision' => nil)).perform }.
+            to raise_error(API::InvalidAttributesError)
       end
     end
 
     context "[attributes]" do
+      it "works for js:hosted types" do
+        js_params = @params.merge({
+                                      "client"         => "javascript",
+                                      "class_name"     => "ReferenceError",
+                                      "message"        => "foo is not defined",
+                                      "backtraces"     => [
+                                          {
+                                              "name"      => "Active Thread",
+                                              "faulted"   => true,
+                                              "backtrace" => [
+                                                  {
+                                                      "url"     => "http://localhost:3000/assets/vendor.js",
+                                                      "line"    => 11671,
+                                                      "symbol"  => "?",
+                                                      "context" => nil,
+                                                      "type"    => "js:hosted"
+                                                  }
+                                              ]
+                                          }
+                                      ],
+                                      "capture_method" => "onerror",
+                                      "occurred_at"    => "2014-05-26T22:43:31Z",
+                                      "schema"         => "http",
+                                      "host"           => "localhost",
+                                      "port"           => "3000",
+                                      "path"           => "/admin",
+                                      "query"          => "",
+                                      "user_agent"     => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:28.0) Gecko/20100101 Firefox/28.0",
+                                      "screen_width"   => 1920,
+                                      "screen_height"  => 1200,
+                                      "window_width"   => 1870,
+                                      "window_height"  => 767,
+                                      "color_depth"    => 24
+                                  })
+
+        occ = OccurrencesWorker.new(js_params).perform
+        expect(occ).to be_kind_of(Occurrence)
+
+        expect(occ.client).to eql('javascript')
+        expect(occ.bug.environment.name).to eql('production')
+        expect(occ.bug.client).to eql('javascript')
+      end
+
       it "should create an occurrence with the given attributes" do
         occ = OccurrencesWorker.new(@params).perform
-        occ.should be_kind_of(Occurrence)
+        expect(occ).to be_kind_of(Occurrence)
 
-        occ.client.should eql('rails')
-        occ.revision.should eql(@commit.sha)
-        occ.message.should eql("Well crap")
+        expect(occ.client).to eql('rails')
+        expect(occ.revision).to eql(@commit.sha)
+        expect(occ.message).to eql("Well crap")
         occ.faulted_backtrace.zip(@exception.backtrace).each do |(element), bt_line|
           next if bt_line.include?('.java') # we test the java portions of the backtrace elsewhere
-          bt_line.include?("#{element['file']}:#{element['line']}").should be_true
-          bt_line.end_with?(":in `#{element['method']}'").should(be_true) if element['method']
+          expect(bt_line.include?("#{element['file']}:#{element['line']}")).to eql(true)
+          expect(bt_line.end_with?(":in `#{element['method']}'")).to(eql(true)) if element['method']
         end
 
-        occ.bug.environment.name.should eql('production')
-        occ.bug.client.should eql('rails')
-        occ.bug.class_name.should eql("ArgumentError")
-        occ.bug.file.should eql(THIS_FILE)
-        occ.bug.line.should eql(@line)
-        occ.bug.blamed_revision.should be_nil
-        occ.bug.message_template.should eql("Well crap")
-        occ.bug.revision.should eql(@commit.sha)
+        expect(occ.bug.environment.name).to eql('production')
+        expect(occ.bug.client).to eql('rails')
+        expect(occ.bug.class_name).to eql("ArgumentError")
+        expect(occ.bug.file).to eql(THIS_FILE)
+        expect(occ.bug.line).to eql(@line)
+        expect(occ.bug.blamed_revision).to be_nil
+        expect(occ.bug.message_template).to eql("Well crap")
+        expect(occ.bug.revision).to eql(@commit.sha)
       end
 
       context "[PII filtering]" do
         it "should filter emails from the occurrence message" do
           @params['message'] = "Duplicate entry 'foo.2001@example.com' for key 'index_users_on_email'"
           occ                = OccurrencesWorker.new(@params).perform
-          occ.message.should eql("Duplicate entry '[EMAIL?]' for key 'index_users_on_email'")
+          expect(occ.message).to eql("Duplicate entry '[EMAIL?]' for key 'index_users_on_email'")
         end
 
         it "should filter phone numbers from the occurrence message" do
           @params['message'] = "My phone number is (206) 356-2754."
           occ                = OccurrencesWorker.new(@params).perform
-          occ.message.should eql("My phone number is (206) [PHONE?].")
+          expect(occ.message).to eql("My phone number is (206) [PHONE?].")
         end
 
         it "should filter credit card numbers from the occurrence message" do
           @params['message'] = "I bought this using my 4426-2480-0548-1000 card."
           occ                = OccurrencesWorker.new(@params).perform
-          occ.message.should eql("I bought this using my [CC/BANK?] card.")
+          expect(occ.message).to eql("I bought this using my [CC/BANK?] card.")
         end
 
         it "should filter bank account numbers from the occurrence message" do
           @params['message'] = "Please remit to 80054810."
           occ                = OccurrencesWorker.new(@params).perform
-          occ.message.should eql("Please remit to [CC/BANK?].")
+          expect(occ.message).to eql("Please remit to [CC/BANK?].")
         end
 
         it "should not perform filtering if filtering is disabled" do
@@ -159,64 +202,156 @@
 
           @params['message'] = "Please remit to 80054810."
           occ                = OccurrencesWorker.new(@params).perform
-          occ.message.should eql("Please remit to 80054810.")
+          expect(occ.message).to eql("Please remit to 80054810.")
 
           @project.update_attribute :disable_message_filtering, false
         end
+
+        it "should filter PII from the query" do
+          @params['query'] = 'email=foo@bar.com&name=Tim'
+          occ              = OccurrencesWorker.new(@params).perform
+          expect(occ.query).to eql('email=[EMAIL?]&name=Tim')
+        end
+
+        it "should filter PII from the fragment" do
+          @params['fragment'] = 'email=foo@bar.com&name=Tim'
+          occ                 = OccurrencesWorker.new(@params).perform
+          expect(occ.fragment).to eql('email=[EMAIL?]&name=Tim')
+        end
+
+        it "should filter PII from the parent_exceptions' messages and instance variables" do
+          @params['parent_exceptions'] = [{"class_name"  => "ActiveRecord::RecordNotUnique",
+                                           "message"     =>
+                                               "Mysql2::Error: Duplicate entry 'test@foobar.com' for key 'index_guest_visitors_on_email': UPDATE `guest_visitors` SET `email` = 'test@foobar.com' WHERE `guest_visitors`.`id` = 77870 /* engines/guest/app/controllers/guest/groups_controller.rb:155:in `update' */",
+                                           "backtraces"  =>
+                                               [{"name"      => "Active Thread/Fiber",
+                                                 "faulted"   => true,
+                                                 "backtrace" =>
+                                                     [{"file"   =>
+                                                           "/app/go/shared/bundle/ruby/2.2.0/gems/mysql2-0.4.1/lib/mysql2/client.rb",
+                                                       "line"   => 85,
+                                                       "symbol" => "_query"},
+                                                      {"file"   =>
+                                                           "/app/go/shared/bundle/ruby/2.2.0/gems/mysql2-0.4.1/lib/mysql2/client.rb",
+                                                       "line"   => 85,
+                                                       "symbol" => "block in query"}]}],
+                                           "association" => "original_exception",
+                                           "ivars"       =>
+                                               {"original_exception"          =>
+                                                    {"language"   => "ruby",
+                                                     "class_name" => "Mysql2::Error",
+                                                     "inspect"    =>
+                                                         "#<Mysql2::Error: Duplicate entry 'test@foobar.com' for key 'index_guest_visitors_on_email'>",
+                                                     "yaml"       =>
+                                                         "--- !ruby/exception:Mysql2::Error\nmessage: Duplicate entry 'test@foobar.com' for key 'index_guest_visitors_on_email'\nserver_version: 50626\nerror_number: 1062\nsql_state: '23000'\n",
+                                                     "json"       =>
+                                                         "{\"server_version\":50626,\"error_number\":1062,\"sql_state\":\"test@foobar.com\"}",
+                                                     "to_s"       =>
+                                                         "Duplicate entry 'test@foobar.com' for key 'index_guest_visitors_on_email'"},
+                                                "_squash_controller_notified" => true}}]
+          occ                          = OccurrencesWorker.new(@params).perform
+          expect(occ.parent_exceptions.first['message']).to eql("Mysql2::Error: Duplicate entry '[EMAIL?]' for key 'index_guest_visitors_on_email': UPDATE `guest_visitors` SET `email` = '[EMAIL?]' WHERE `guest_visitors`.`id` = 77870 /* engines/guest/app/controllers/guest/groups_controller.rb:155:in `update' */")
+          expect(occ.parent_exceptions.first['ivars']['original_exception']['inspect']).to eql("#<Mysql2::Error: Duplicate entry '[EMAIL?]' for key 'index_guest_visitors_on_email'>")
+          expect(occ.parent_exceptions.first['ivars']['original_exception']['yaml']).to eql("--- !ruby/exception:Mysql2::Error\nmessage: Duplicate entry '[EMAIL?]' for key 'index_guest_visitors_on_email'\nserver_version: 50626\nerror_number: 1062\nsql_state: '23000'\n")
+          expect(occ.parent_exceptions.first['ivars']['original_exception']['json']).to eql("{\"server_version\":50626,\"error_number\":1062,\"sql_state\":\"[EMAIL?]\"}")
+          expect(occ.parent_exceptions.first['ivars']['original_exception']['to_s']).to eql("Duplicate entry '[EMAIL?]' for key 'index_guest_visitors_on_email'")
+        end
+
+        it "should filter PII from the session" do
+          @params['session'] = {"email" => "test@foobar.com",
+                                "other" => "something"}
+          occ                = OccurrencesWorker.new(@params).perform
+          expect(occ.session['email']).to eql('[EMAIL?]')
+        end
+
+        it "should filter PII from the headers" do
+          @params['headers'] = {"email" => "test@foobar.com",
+                                "other" => "something"}
+          occ                = OccurrencesWorker.new(@params).perform
+          expect(occ.headers['email']).to eql('[EMAIL?]')
+        end
+
+        it "should filter PII from the flash" do
+          @params['flash'] = {"email" => "test@foobar.com",
+                              "other" => "something"}
+          occ              = OccurrencesWorker.new(@params).perform
+          expect(occ.flash['email']).to eql('[EMAIL?]')
+        end
+
+        it "should filter PII from the params" do
+          @params['params'] = {"email" => "test@foobar.com",
+                               "other" => "something"}
+          occ               = OccurrencesWorker.new(@params).perform
+          expect(occ.params['email']).to eql('[EMAIL?]')
+        end
+
+        it "should filter PII from the cookies" do
+          @params['cookies'] = {"email" => "test@foobar.com",
+                                "other" => "something"}
+          occ                = OccurrencesWorker.new(@params).perform
+          expect(occ.cookies['email']).to eql('[EMAIL?]')
+        end
+
+        it "should filter PII from the ivars" do
+          @params['ivars'] = {"email" => "test@foobar.com",
+                              "other" => "something"}
+          occ              = OccurrencesWorker.new(@params).perform
+          expect(occ.ivars['email']).to eql('[EMAIL?]')
+        end
       end
 
       it "should stick any attributes it doesn't recognize into the metadata attribute" do
         occ = OccurrencesWorker.new(@params.merge('testfoo' => 'testbar')).perform
-        JSON.parse(occ.metadata)['testfoo'].should eql('testbar')
+        expect(JSON.parse(occ.metadata)['testfoo']).to eql('testbar')
       end
 
       it "should set user agent variables when a user agent is specified" do
         occ = OccurrencesWorker.new(@params.merge('headers' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.55.3 (KHTML, like Gecko) Version/5.1.5 Safari/534.55.3'})).perform
-        occ.browser_name.should eql("Safari")
-        occ.browser_version.should eql("5.1.5")
-        occ.browser_engine.should eql("webkit")
-        occ.browser_os.should eql("OS X 10.7")
-        occ.browser_engine_version.should eql("534.55.3")
+        expect(occ.browser_name).to eql("Safari")
+        expect(occ.browser_version).to eql("5.1.5")
+        expect(occ.browser_engine).to eql("webkit")
+        expect(occ.browser_os).to eql("OS X 10.7")
+        expect(occ.browser_engine_version).to eql("534.55.3")
       end
 
       it "should remove the SQL query from a SQL error message" do
         msg = <<-ERR.strip
-          Duplicate entry 'foo@bar.com' for key 'index_users_on_email': UPDATE `users` SET `name` = 'Sancho Sample', `crypted_password` = 'sughwgiuwgbajgw', `updated_at` = '2012-09-23 21:18:37', `email` = 'foo@bar.com' WHERE `id` = 26819622 -- app/controllers/api/v1/user_controller.rb:35
+          Duplicate entry 'foo@bar.com' for key 'index_users_on_email': UPDATE `users` SET `name` = 'Sancho Sample', `crypted_password` = 'sughwgiuwgbajgw', `updated_at` = '2013-09-23 21:18:37', `email` = 'foo@bar.com' WHERE `id` = 26819622 -- app/controllers/api/v1/user_controller.rb:35
         ERR
         occ = OccurrencesWorker.new(@params.merge('class_name' => 'Mysql::Error', 'message' => msg)).perform
-        JSON.parse(occ.metadata)['message'].should eql("Duplicate entry '[EMAIL?]' for key 'index_users_on_email'")
+        expect(JSON.parse(occ.metadata)['message']).to eql("Duplicate entry '[EMAIL?]' for key 'index_users_on_email'")
       end
     end
 
     context "[blame]" do
       it "should set the bug's blamed_revision when there's blame to be had" do
         occ = OccurrencesWorker.new(@params.merge('backtraces' => [{'name' => "Thread 0", 'faulted' => true, 'backtrace' => @valid_trace}])).perform
-        occ.bug.blamed_revision.should eql('30e7c2ff8758f4f19bfbc0a57e26c19ab69d1d44')
+        expect(occ.bug.blamed_revision).to eql('30e7c2ff8758f4f19bfbc0a57e26c19ab69d1d44')
       end
 
       it "should match an existing bug by file, line, and class name if no blame is available" do
         env = @project.environments.where(name: 'production').find_or_create!
         bug = FactoryGirl.create(:bug, environment: env, file: THIS_FILE, line: @line, class_name: 'ArgumentError')
         occ = OccurrencesWorker.new(@params).perform
-        occ.bug.should eql(bug)
+        expect(occ.bug).to eql(bug)
       end
 
       it "should match an existing bug by file, line, class name, and commit when there's blame to be had" do
         env = @project.environments.where(name: 'production').find_or_create!
         bug = FactoryGirl.create(:bug, environment: env, file: 'lib/better_caller/extensions.rb', line: 11, class_name: 'ArgumentError', blamed_revision: '30e7c2ff8758f4f19bfbc0a57e26c19ab69d1d44')
         occ = OccurrencesWorker.new(@params.merge('backtraces' => [{'name' => "Thread 0", 'faulted' => true, 'backtrace' => @valid_trace}])).perform
-        occ.bug.should eql(bug)
+        expect(occ.bug).to eql(bug)
       end
 
       it "should truncate the error message if it exceeds 1,000 characters" do
         occ = OccurrencesWorker.new(@params.merge('message' => 'a'*1005)).perform
-        occ.bug.message_template.should eql('a'*997 + '...')
-        occ.message.should eql('a'*997 + '...')
+        expect(occ.bug.message_template).to eql('a'*997 + '...')
+        expect(occ.message).to eql('a'*997 + '...')
       end
 
       it "should use the full SHA1 of a revision if an abbreviated revision is specified" do
         occ = OccurrencesWorker.new(@params.merge('revision' => @commit.sha[0, 6])).perform
-        occ.revision.should eql(@commit.sha)
+        expect(occ.revision).to eql(@commit.sha)
       end
     end
 
@@ -239,9 +374,9 @@
         o1  = OccurrencesWorker.new(@params.merge('build' => 'D1')).perform
         # Bug should start out open and be associated with d1
         bug = o1.bug
-        bug.should_not be_fixed
-        bug.should_not be_fix_deployed
-        bug.deploy.should eql(d1)
+        expect(bug).not_to be_fixed
+        expect(bug).not_to be_fix_deployed
+        expect(bug.deploy).to eql(d1)
 
         # R2 is committed and released with D2 (it does not fix the bug)
         d2 = FactoryGirl.create(:deploy, environment: env, revision: r2, build: 'D2')
@@ -249,42 +384,42 @@
         o2 = OccurrencesWorker.new(@params.merge('build' => 'D2')).perform
         # Occurrence should be associated with the original bug;
         # Bug should still be open
-        o2.bug_id.should eql(bug.id)
-        bug.reload.should_not be_fixed
-        bug.should_not be_fix_deployed
+        expect(o2.bug_id).to eql(bug.id)
+        expect(bug.reload).not_to be_fixed
+        expect(bug).not_to be_fix_deployed
         # Bug's deploy should be "upgraded"' to D2
-        bug.deploy.should eql(d2)
+        expect(bug.deploy).to eql(d2)
 
         # R3 is committed (it fixes the bug), but not deployed. Bug is marked as fixed
         bug.update_attributes fixed: true, resolution_revision: r3
         # O3 occurs on a device running R2/D2 (ok nerds, calm down)
         o3 = OccurrencesWorker.new(@params.merge('build' => 'D2')).perform
         # Bug should still be marked as fixed
-        o3.bug_id.should eql(bug.id)
-        bug.reload.should be_fixed
-        bug.should_not be_fix_deployed
-        bug.deploy.should eql(d2)
+        expect(o3.bug_id).to eql(bug.id)
+        expect(bug.reload).to be_fixed
+        expect(bug).not_to be_fix_deployed
+        expect(bug.deploy).to eql(d2)
 
         # R4/D3 (including R3) is released, some devices upgrade.
         d3 = FactoryGirl.create(:deploy, environment: env, revision: r4, build: 'D3')
         # The bug is marked as fix_deployed
         DeployFixMarker.perform(d3.id)
-        bug.reload.should be_fix_deployed
+        expect(bug.reload).to be_fix_deployed
         # O4 occurs on a machine still running R2/D2
         o4 = OccurrencesWorker.new(@params.merge('build' => 'D2')).perform
         # Bug should still be marked as fixed
-        o4.bug_id.should eql(bug.id)
-        bug.reload.should be_fixed
-        bug.should be_fix_deployed
+        expect(o4.bug_id).to eql(bug.id)
+        expect(bug.reload).to be_fixed
+        expect(bug).to be_fix_deployed
 
         # O5 occurs on a device running R4/D3
         o5 = OccurrencesWorker.new(@params.merge('build' => 'D3')).perform
         # The occurrence should have itself a new bug
-        o5.bug_id.should_not eql(bug.id)
-        bug.reload.should be_fixed
-        bug.should be_fix_deployed
-        o5.bug.should_not be_fixed
-        o5.bug.should_not be_fix_deployed
+        expect(o5.bug_id).not_to eql(bug.id)
+        expect(bug.reload).to be_fixed
+        expect(bug).to be_fix_deployed
+        expect(o5.bug).not_to be_fixed
+        expect(o5.bug).not_to be_fix_deployed
       end
     end
 
@@ -302,52 +437,52 @@
 
         # O1 occurs on R1
         o1  = OccurrencesWorker.new(@params.merge('revision' => r1)).perform
-                                 # Bug should start out open
+        # Bug should start out open
         bug = o1.bug
-        bug.should_not be_fixed
-        bug.should_not be_fix_deployed
-        bug.deploy.should be_nil # not a distributed project
+        expect(bug).not_to be_fixed
+        expect(bug).not_to be_fix_deployed
+        expect(bug.deploy).to be_nil # not a distributed project
 
         # R2 is committed and deployed (it does not fix the bug)
         FactoryGirl.create(:deploy, environment: env, revision: r2)
         # O2 occurs
         o2 = OccurrencesWorker.new(@params.merge('revision' => r2)).perform
         # Bug should still be open
-        o2.bug_id.should eql(bug.id)
-        bug.reload.should_not be_fixed
-        bug.should_not be_fix_deployed
+        expect(o2.bug_id).to eql(bug.id)
+        expect(bug.reload).not_to be_fixed
+        expect(bug).not_to be_fix_deployed
 
         # R3 is committed (it fixes the bug), but not deployed. Bug is marked as fixed
         bug.update_attributes fixed: true, resolution_revision: r3
         # O3 occurs on a server running R2
         o3 = OccurrencesWorker.new(@params.merge('revision' => r2)).perform
         # Bug should still be marked as fixed
-        o3.bug_id.should eql(bug.id)
-        bug.reload.should be_fixed
-        bug.should_not be_fix_deployed
+        expect(o3.bug_id).to eql(bug.id)
+        expect(bug.reload).to be_fixed
+        expect(bug).not_to be_fix_deployed
 
         # R4 (including R3) is deployed to some machines.
         d = FactoryGirl.create(:deploy, environment: env, revision: r4)
         # The bug is marked as fix_deployed
         DeployFixMarker.perform(d.id)
-        bug.reload.should be_fix_deployed
+        expect(bug.reload).to be_fix_deployed
         # O4 occurs on a machine still running R2
         o4 = OccurrencesWorker.new(@params.merge('revision' => r2)).perform
         # Bug should still be marked as fixed
-        o4.bug_id.should eql(bug.id)
-        bug.reload.should be_fixed
-        bug.should be_fix_deployed
+        expect(o4.bug_id).to eql(bug.id)
+        expect(bug.reload).to be_fixed
+        expect(bug).to be_fix_deployed
 
         # R4 is now deployed to all machines
         d = FactoryGirl.create(:deploy, environment: env, revision: r4)
         DeployFixMarker.perform(d.id)
-        bug.reload.should be_fix_deployed
+        expect(bug.reload).to be_fix_deployed
         # O5 occurs on a machine running R4
         o5 = OccurrencesWorker.new(@params.merge('revision' => r4)).perform
         # The bug should be reopened
-        o5.bug_id.should eql(bug.id)
-        bug.reload.should_not be_fixed
-        bug.should_not be_fix_deployed
+        expect(o5.bug_id).to eql(bug.id)
+        expect(bug.reload).not_to be_fixed
+        expect(bug).not_to be_fix_deployed
       end
 
       it "should reopen an existing bug that is fixed, not deployed, and stale" do
@@ -355,8 +490,8 @@
         bug = FactoryGirl.create(:bug, environment: env, file: THIS_FILE, line: @line, class_name: 'ArgumentError', fixed: true)
         bug.update_attribute :fixed_at, Time.now - 15.days
         OccurrencesWorker.new(@params).perform
-        bug.reload.should_not be_fixed
-        bug.fix_deployed?.should be_false
+        expect(bug.reload).not_to be_fixed
+        expect(bug.fix_deployed?).to eql(false)
       end
 
       it "should set a cause for a bug being reopened" do
@@ -367,9 +502,9 @@
 
         occ = OccurrencesWorker.new(@params).perform
 
-        bug.events(true).count.should eql(1)
-        bug.events.first.kind.should eql('reopen')
-        bug.events.first.data['occurrence_id'].should eql(occ.id)
+        expect(bug.events(true).count).to eql(1)
+        expect(bug.events.first.kind).to eql('reopen')
+        expect(bug.events.first.data['occurrence_id']).to eql(occ.id)
       end
     end
   end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 1e80e79c..e01c0add 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require "spec_helper"
+require 'rails_helper'
 
-describe NotificationMailer do
+RSpec.describe NotificationMailer do
   before(:all) { @env = FactoryGirl.create(:environment) }
 
   before :each do
@@ -24,31 +24,31 @@
 
   describe "#blame" do
     it "should create an email event" do
-      @bug.stub!(:blamed_email).and_return('foo@bar.com')
-      NotificationMailer.deliver :blame, @bug
-      @bug.events.count.should eql(@count + 1)
-      @bug.events.order('id DESC').first.kind.should eql('email')
-      @bug.events.order('id DESC').first.data['recipients'].should eql(['foo@bar.com'])
+      allow(@bug).to receive(:blamed_email).and_return('foo@bar.com')
+      NotificationMailer.blame(@bug).deliver_now
+      expect(@bug.events.count).to eql(@count + 1)
+      expect(@bug.events.order('id DESC').first.kind).to eql('email')
+      expect(@bug.events.order('id DESC').first.data['recipients']).to eql(['foo@bar.com'])
     end
 
     it "... unless no email was sent" do
-      NotificationMailer.deliver :blame, @bug
-      @bug.events.count.should eql(@count)
+      NotificationMailer.blame(@bug).deliver_now
+      expect(@bug.events.count).to eql(@count)
     end
   end
 
   describe "#critical" do
     it "should create an email event" do
       @bug.environment.project.critical_mailing_list = 'foo@bar.com'
-      NotificationMailer.deliver :critical, @bug
-      @bug.events.count.should eql(@count + 1)
-      @bug.events.order('id DESC').first.kind.should eql('email')
-      @bug.events.order('id DESC').first.data['recipients'].should eql(['foo@bar.com'])
+      NotificationMailer.critical(@bug).deliver_now
+      expect(@bug.events.count).to eql(@count + 1)
+      expect(@bug.events.order('id DESC').first.kind).to eql('email')
+      expect(@bug.events.order('id DESC').first.data['recipients']).to eql(['foo@bar.com'])
     end
 
     it "... unless no email was sent" do
-      NotificationMailer.deliver :critical, @bug
-      @bug.events.count.should eql(@count)
+      NotificationMailer.critical(@bug).deliver_now
+      expect(@bug.events.count).to eql(@count)
     end
   end
 end
diff --git a/spec/models/blame_spec.rb b/spec/models/blame_spec.rb
index 4e3c8012..ef741055 100644
--- a/spec/models/blame_spec.rb
+++ b/spec/models/blame_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Blame do
+RSpec.describe Blame, type: :model do
 end
diff --git a/spec/models/bug_spec.rb b/spec/models/bug_spec.rb
index 167c8f08..c00868f5 100644
--- a/spec/models/bug_spec.rb
+++ b/spec/models/bug_spec.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,45 +14,45 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Bug do
+RSpec.describe Bug, type: :model do
   context "[database rules]" do
     it "should automatically increment/decrement occurrences_count" do
       bug = FactoryGirl.create(:bug)
-      bug.occurrences_count.should be_zero
+      expect(bug.occurrences_count).to be_zero
 
       occurrence = FactoryGirl.create(:rails_occurrence, bug: bug)
-      bug.reload.occurrences_count.should eql(1)
+      expect(bug.reload.occurrences_count).to eql(1)
 
       occurrence.destroy
-      bug.reload.occurrences_count.should be_zero
+      expect(bug.reload.occurrences_count).to be_zero
     end
 
     it "should automatically increment/decrement comments_count" do
       bug   = FactoryGirl.create(:bug)
       owner = bug.environment.project.owner
-      bug.comments_count.should be_zero
+      expect(bug.comments_count).to be_zero
 
       comment = FactoryGirl.create(:comment, bug: bug, user: owner)
-      bug.reload.comments_count.should eql(1)
+      expect(bug.reload.comments_count).to eql(1)
 
       comment.destroy
-      bug.reload.comments_count.should be_zero
+      expect(bug.reload.comments_count).to be_zero
     end
 
     it "should automatically set latest_occurrence" do
       bug = FactoryGirl.create(:bug)
-      bug.latest_occurrence.should be_nil
+      expect(bug.latest_occurrence).to be_nil
 
       occurrence = FactoryGirl.create(:rails_occurrence, bug: bug)
-      bug.reload.latest_occurrence.should eql(occurrence.occurred_at)
+      expect(bug.reload.latest_occurrence).to eql(occurrence.occurred_at)
 
       occurrence = FactoryGirl.create(:rails_occurrence, bug: bug, occurred_at: occurrence.occurred_at + 1.day)
-      bug.reload.latest_occurrence.should eql(occurrence.occurred_at)
+      expect(bug.reload.latest_occurrence).to eql(occurrence.occurred_at)
 
       FactoryGirl.create :rails_occurrence, bug: bug, occurred_at: occurrence.occurred_at - 5.hours
-      bug.reload.latest_occurrence.should eql(occurrence.occurred_at)
+      expect(bug.reload.latest_occurrence).to eql(occurrence.occurred_at)
     end
 
     it "should set number sequentially for a given bug" do
@@ -64,10 +64,10 @@
       bug2_1 = FactoryGirl.create(:bug, environment: env2)
       bug2_2 = FactoryGirl.create(:bug, environment: env2)
 
-      bug1_1.number.should eql(1)
-      bug1_2.number.should eql(2)
-      bug2_1.number.should eql(1)
-      bug2_2.number.should eql(2)
+      expect(bug1_1.number).to eql(1)
+      expect(bug1_2.number).to eql(2)
+      expect(bug2_1.number).to eql(1)
+      expect(bug2_2.number).to eql(2)
     end
 
     it "should not reuse deleted numbers" do
@@ -82,21 +82,21 @@
       c = FactoryGirl.create(:rails_occurrence, bug: bug)
       FactoryGirl.create :rails_occurrence, bug: bug
       c.destroy
-      FactoryGirl.create(:rails_occurrence, bug: bug).number.should eql(4)
+      expect(FactoryGirl.create(:rails_occurrence, bug: bug).number).to eql(4)
     end
   end
 
   context "[hooks]" do
     it "should downcase the revision" do
-      FactoryGirl.create(:bug, revision: '2DC20C984283BEDE1F45863B8F3B4DD9B5B554CC').revision.should eql('2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
+      expect(FactoryGirl.create(:bug, revision: '2DC20C984283BEDE1F45863B8F3B4DD9B5B554CC').revision).to eql('2dc20c984283bede1f45863b8f3b4dd9b5b554cc')
     end
 
     it "should set fixed_at when a bug is fixed" do
       bug = FactoryGirl.create(:bug)
-      bug.fixed_at.should be_nil
+      expect(bug.fixed_at).to be_nil
       bug.fixed = true
       bug.save!
-      bug.fixed_at.to_i.should be_within(2).of(Time.now.to_i)
+      expect(bug.fixed_at.to_i).to be_within(2).of(Time.now.to_i)
     end
 
     context "[PagerDuty integration]" do
@@ -108,13 +108,13 @@
       end
 
       it "should not send any PagerDuty events when the bug is modified other than described below" do
-        Service::PagerDuty.any_instance.should_not_receive(:acknowledge)
-        Service::PagerDuty.any_instance.should_not_receive(:resolve)
+        expect_any_instance_of(Service::PagerDuty).not_to receive(:acknowledge)
+        expect_any_instance_of(Service::PagerDuty).not_to receive(:resolve)
         @bug.update_attribute :jira_issue, 'ONCALL-1367'
       end
 
       it "should send a PagerDuty acknowledge event when the bug is assigned" do
-        Service::PagerDuty.any_instance.should_receive(:acknowledge).once.with(
+        expect_any_instance_of(Service::PagerDuty).to receive(:acknowledge).once.with(
             @bug.pagerduty_incident_key,
             /was assigned to #{Regexp.escape @user.name}/,
             an_instance_of(Hash)
@@ -123,7 +123,7 @@
       end
 
       it "should send a PagerDuty acknowledge event when the bug is marked irrelevant" do
-        Service::PagerDuty.any_instance.should_receive(:acknowledge).once.with(
+        expect_any_instance_of(Service::PagerDuty).to receive(:acknowledge).once.with(
             @bug.pagerduty_incident_key,
             /was marked as irrelevant/,
             an_instance_of(Hash)
@@ -132,7 +132,7 @@
       end
 
       it "should send a PagerDuty acknowledge event when the bug is resolved" do
-        Service::PagerDuty.any_instance.should_receive(:acknowledge).once.with(
+        expect_any_instance_of(Service::PagerDuty).to receive(:acknowledge).once.with(
             @bug.pagerduty_incident_key,
             /was marked as resolved/,
             an_instance_of(Hash)
@@ -141,10 +141,10 @@
       end
 
       it "should send a PagerDuty resolve event when the bug is deployed" do
-        Service::PagerDuty.any_instance.should_receive(:acknowledge).once
+        expect_any_instance_of(Service::PagerDuty).to receive(:acknowledge).once
         @bug.update_attribute :fixed, true
 
-        Service::PagerDuty.any_instance.should_receive(:resolve).once.with(
+        expect_any_instance_of(Service::PagerDuty).to receive(:resolve).once.with(
             @bug.pagerduty_incident_key,
             /was deployed/
         )
@@ -154,21 +154,21 @@
       it "should not send any events when the environment has PagerDuty disabled" do
         @environment.update_attribute :notifies_pagerduty, false
         @bug.reload
-        Service::PagerDuty.any_instance.should_not_receive(:resolve)
+        expect_any_instance_of(Service::PagerDuty).not_to receive(:resolve)
         @bug.update_attribute :fixed, true
       end
 
       it "should not send any events when the project has no PagerDuty configuration" do
         @project.update_attribute :pagerduty_service_key, nil
         @bug.reload
-        Service::PagerDuty.any_instance.should_not_receive(:resolve)
+        expect_any_instance_of(Service::PagerDuty).not_to receive(:resolve)
         @bug.update_attribute :fixed, true
       end
 
       it "should send events when the project has PagerDuty incident reporting disabled" do
         @project.update_attribute :pagerduty_enabled, false
         @bug.reload
-        Service::PagerDuty.any_instance.should_receive(:acknowledge).once
+        expect_any_instance_of(Service::PagerDuty).to receive(:acknowledge).once
         @bug.update_attribute :fixed, true
       end
     end unless Squash::Configuration.pagerduty.disabled?
@@ -177,15 +177,15 @@
   context "[validations]" do
     it "should not allow an unfixed bug to be marked as fix_deployed" do
       bug = FactoryGirl.build(:bug, fixed: false, fix_deployed: true)
-      bug.should_not be_valid
-      bug.errors[:fix_deployed].should_not be_empty
+      expect(bug).not_to be_valid
+      expect(bug.errors[:fix_deployed]).not_to be_empty
     end
 
     it "should only let project members be assigned to bugs" do
       bug               = FactoryGirl.create(:bug)
       bug.assigned_user = FactoryGirl.create(:user)
-      bug.should_not be_valid
-      bug.errors[:assigned_user_id].should eql(['is not a project member'])
+      expect(bug).not_to be_valid
+      expect(bug.errors[:assigned_user_id]).to eql(['is not a project member'])
     end
   end
 
@@ -198,8 +198,8 @@
     context "[open]" do
       it "should create an open event when first created" do
         bug = FactoryGirl.create(:bug, environment: @environment)
-        bug.events.count.should eql(1)
-        bug.events.first.kind.should eql('open')
+        expect(bug.events.count).to eql(1)
+        expect(bug.events.first.kind).to eql('open')
       end
     end
 
@@ -215,9 +215,9 @@
 
         @bug.update_attribute :assigned_user, @assignee
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('assign')
-        event.user_id.should eql(@modifier.id)
-        event.data['assignee_id'].should eql(@assignee.id)
+        expect(event.kind).to eql('assign')
+        expect(event.user_id).to eql(@modifier.id)
+        expect(event.data['assignee_id']).to eql(@assignee.id)
       end
 
       it "should create an assign event when assigned by a user to to no one" do
@@ -226,9 +226,9 @@
 
         @bug.update_attribute :assigned_user, nil
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('assign')
-        event.user_id.should eql(@modifier.id)
-        event.data['assignee_id'].should be_nil
+        expect(event.kind).to eql('assign')
+        expect(event.user_id).to eql(@modifier.id)
+        expect(event.data['assignee_id']).to be_nil
       end
 
       it "should create an assign event when assigned by no one to a user" do
@@ -237,9 +237,9 @@
 
         @bug.update_attribute :assigned_user, @assignee
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('assign')
-        event.user_id.should be_nil
-        event.data['assignee_id'].should eql(@assignee.id)
+        expect(event.kind).to eql('assign')
+        expect(event.user_id).to be_nil
+        expect(event.data['assignee_id']).to eql(@assignee.id)
       end
 
       it "should create an assign event when assigned by no one to to no one" do
@@ -248,9 +248,9 @@
 
         @bug.update_attribute :assigned_user, nil
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('assign')
-        event.user_id.should be_nil
-        event.data['assignee_id'].should be_nil
+        expect(event.kind).to eql('assign')
+        expect(event.user_id).to be_nil
+        expect(event.data['assignee_id']).to be_nil
       end
     end
 
@@ -263,8 +263,8 @@
         @bug.update_attribute :duplicate_of, original
 
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('dupe')
-        event.user_id.should eql(@modifier.id)
+        expect(event.kind).to eql('dupe')
+        expect(event.user_id).to eql(@modifier.id)
       end
 
       it "should create a dupe event when marked as a duplicate" do
@@ -272,8 +272,8 @@
         @bug.update_attribute :duplicate_of, original
 
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('dupe')
-        event.user_id.should be_nil
+        expect(event.kind).to eql('dupe')
+        expect(event.user_id).to be_nil
       end
     end
 
@@ -288,10 +288,10 @@
 
         @bug.update_attributes fixed: true, resolution_revision: @revision
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('close')
-        event.user_id.should be_nil
-        event.data['status'].should eql('fixed')
-        event.data['revision'].should eql(@revision)
+        expect(event.kind).to eql('close')
+        expect(event.user_id).to be_nil
+        expect(event.data['status']).to eql('fixed')
+        expect(event.data['revision']).to eql(@revision)
       end
 
       it "should create a 'fixed' close event when fixed by a user" do
@@ -301,10 +301,10 @@
 
         @bug.update_attributes fixed: true, resolution_revision: @revision
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('close')
-        event.user.should eql(@modifier)
-        event.data['status'].should eql('fixed')
-        event.data['revision'].should eql(@revision)
+        expect(event.kind).to eql('close')
+        expect(event.user).to eql(@modifier)
+        expect(event.data['status']).to eql('fixed')
+        expect(event.data['revision']).to eql(@revision)
       end
 
       it "should create an 'irrelevant' close event when marked irrelevant" do
@@ -314,9 +314,9 @@
 
         @bug.update_attribute :irrelevant, true
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('close')
-        event.user_id.should be_nil
-        event.data['status'].should eql('irrelevant')
+        expect(event.kind).to eql('close')
+        expect(event.user_id).to be_nil
+        expect(event.data['status']).to eql('irrelevant')
       end
 
       it "should create an 'irrelevant' close event when marked irrelevant by a user" do
@@ -326,9 +326,9 @@
 
         @bug.update_attribute :irrelevant, true
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('close')
-        event.user.should eql(@modifier)
-        event.data['status'].should eql('irrelevant')
+        expect(event.kind).to eql('close')
+        expect(event.user).to eql(@modifier)
+        expect(event.data['status']).to eql('irrelevant')
       end
 
       it "should create a 'fixed' close event when fixed and marked irrelevant" do
@@ -340,20 +340,20 @@
         @bug.resolution_revision = @revision
         @bug.save!
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('close')
-        event.data['status'].should eql('fixed')
-        event.data['revision'].should eql(@revision)
+        expect(event.kind).to eql('close')
+        expect(event.data['status']).to eql('fixed')
+        expect(event.data['revision']).to eql(@revision)
       end
     end
 
     context "[deploy]" do
-      before(:all) { @bug = FactoryGirl.create(:bug, environment: @environment, fixed: true) }
+      before(:each) { @bug = FactoryGirl.create(:bug, environment: @environment, fixed: true) }
 
       it "should create a deploy event when marked fix_deployed" do
         @bug.update_attribute :fix_deployed, true
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('deploy')
-        event.data['revision'].should be_nil
+        expect(event.kind).to eql('deploy')
+        expect(event.data['revision']).to be_nil
       end
 
       it "should create a deploy event with revision when marked fix_deployed by a deploy" do
@@ -363,8 +363,8 @@
 
         @bug.update_attribute :fix_deployed, true
         event = @bug.events(true).order('id ASC').last
-        event.kind.should eql('deploy')
-        event.data['revision'].should eql(deploy.revision)
+        expect(event.kind).to eql('deploy')
+        expect(event.data['revision']).to eql(deploy.revision)
       end
     end
 
@@ -377,39 +377,39 @@
       it "should send an email if the bug was reopened from a fixed state by the system" do
         ActionMailer::Base.deliveries.clear
         @bug.reopen @occurrence
-        @bug.stub!(:blamed_email).and_return('blamed@example.com')
+        allow(@bug).to receive(:blamed_email).and_return('blamed@example.com')
         @bug.assigned_user = @modifier
         @bug.save!
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include('Reopened')
-        ActionMailer::Base.deliveries.first.to.should eql([@modifier.email])
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include('Reopened')
+        expect(ActionMailer::Base.deliveries.first.to).to eql([@modifier.email])
       end
 
       it "should email the blamed user if no one is assigned" do
         ActionMailer::Base.deliveries.clear
         @bug.reopen @occurrence
-        @bug.stub!(:blamed_email).and_return('blamed@example.com')
+        allow(@bug).to receive(:blamed_email).and_return('blamed@example.com')
         @bug.save!
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include('Reopened')
-        ActionMailer::Base.deliveries.first.to.should eql(%w(blamed@example.com))
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include('Reopened')
+        expect(ActionMailer::Base.deliveries.first.to).to eql(%w(blamed@example.com))
       end
 
       it "should not send an email if the bug was reopened from an irrelevant state" do
         @bug.update_attribute :irrelevant, true
         ActionMailer::Base.deliveries.clear
         @bug.reopen @occurrence
-        @bug.stub!(:blamed_email).and_return('blamed@example.com')
+        allow(@bug).to receive(:blamed_email).and_return('blamed@example.com')
         @bug.save!
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the bug was reopened by a user" do
         ActionMailer::Base.deliveries.clear
         @bug.reopen @modifier
-        @bug.stub!(:blamed_email).and_return('blamed@example.com')
+        allow(@bug).to receive(:blamed_email).and_return('blamed@example.com')
         @bug.save!
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       {'user' => '@modifier', 'occurrence' => '@occurrence'}.each do |modifier_type, modifier|
@@ -419,12 +419,12 @@
           it "should create an 'unfixed' reopen event when a relevant fixed bug is marked unfixed" do
             @bug.update_attribute :fixed, false
             event = @bug.events(true).order('id ASC').last
-            event.kind.should eql('reopen')
-            event.data['from'].should eql('fixed')
+            expect(event.kind).to eql('reopen')
+            expect(event.data['from']).to eql('fixed')
             if @bug.modifier.kind_of?(User)
-              event.user.should eql(@bug.modifier)
+              expect(event.user).to eql(@bug.modifier)
             else
-              event.data['occurrence_id'].should eql(@bug.modifier.id)
+              expect(event.data['occurrence_id']).to eql(@bug.modifier.id)
             end
           end
 
@@ -433,7 +433,7 @@
             Event.delete_all
 
             @bug.update_attribute :fixed, false
-            @bug.events(true).count.should be_zero
+            expect(@bug.events(true).count).to be_zero
           end
 
           it "should create a 'relevant' reopen event when an unfixed irrelevant bug is marked relevant" do
@@ -441,12 +441,12 @@
 
             @bug.update_attribute :irrelevant, false
             event = @bug.events(true).order('id ASC').last
-            event.kind.should eql('reopen')
-            event.data['from'].should eql('irrelevant')
+            expect(event.kind).to eql('reopen')
+            expect(event.data['from']).to eql('irrelevant')
             if @bug.modifier.kind_of?(User)
-              event.user.should eql(@bug.modifier)
+              expect(event.user).to eql(@bug.modifier)
             else
-              event.data['occurrence_id'].should eql(@bug.modifier.id)
+              expect(event.data['occurrence_id']).to eql(@bug.modifier.id)
             end
           end
 
@@ -455,7 +455,7 @@
             Event.delete_all
 
             @bug.update_attribute :irrelevant, false
-            @bug.events(true).count.should be_zero
+            expect(@bug.events(true).count).to be_zero
           end
         end
       end
@@ -478,26 +478,26 @@
       it "should send an email when a user assigns the bug to another user" do
         @bug.modifier = @assigner
         @bug.update_attribute :assigned_user, @assignee
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include("You have been assigned")
-        ActionMailer::Base.deliveries.first.to.should include(@assignee.email)
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include("You have been assigned")
+        expect(ActionMailer::Base.deliveries.first.to).to include(@assignee.email)
       end
 
       it "should not send an email when the system assigns the bug to another user" do
         @bug.update_attribute :assigned_user, @assignee
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email when a user assigns the bug to himself" do
         @bug.modifier = @assignee
         @bug.update_attribute :assigned_user, @assignee
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email when a user un-assigns a bug" do
         @bug.modifier = @assigner
         @bug.update_attribute :assigned_user, nil
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the bug is fixed" do
@@ -506,7 +506,7 @@
 
         @bug.modifier = @assigner
         @bug.update_attribute :assigned_user, @assignee
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the bug is irrelevant" do
@@ -515,21 +515,21 @@
 
         @bug.modifier = @assigner
         @bug.update_attribute :assigned_user, @assignee
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the environment has email sending disabled" do
         @bug.environment.update_attribute :sends_emails, false
         @bug.modifier = @assigner
         @bug.update_attribute :assigned_user, @assignee
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the user has assignment emails disabled" do
         Membership.for(@assignee, @project).first.update_attribute :send_assignment_emails, false
         @bug.modifier = @assigner
         @bug.update_attribute :assigned_user, @assignee
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
     end
 
@@ -551,23 +551,23 @@
         @bug.modifier = @resolver
         @bug.update_attribute :fixed, true
 
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include("was resolved")
-        ActionMailer::Base.deliveries.first.to.should include(@assigned.email)
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include("was resolved")
+        expect(ActionMailer::Base.deliveries.first.to).to include(@assigned.email)
       end
 
       it "should send an email when the system resolves a bug" do
         @bug.update_attribute :fixed, true
 
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include("was resolved")
-        ActionMailer::Base.deliveries.first.to.should include(@assigned.email)
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include("was resolved")
+        expect(ActionMailer::Base.deliveries.first.to).to include(@assigned.email)
       end
 
       it "should not send an email when the assigned user resolves a bug" do
         @bug.modifier = @assigned
         @bug.update_attribute :fixed, true
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the bug is marked irrelevant" do
@@ -575,7 +575,7 @@
         ActionMailer::Base.deliveries.clear
         @bug.modifier = @resolver
         @bug.update_attribute :fixed, true
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the bug is resolved and no one is assigned" do
@@ -583,30 +583,30 @@
         ActionMailer::Base.deliveries.clear
         @bug.modifier = @resolver
         @bug.update_attribute :fixed, true
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should send an email when someone other than the assigned user marks a bug irrelevant" do
         @bug.modifier = @resolver
         @bug.update_attribute :irrelevant, true
 
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include("was marked irrelevant")
-        ActionMailer::Base.deliveries.first.to.should include(@assigned.email)
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include("was marked irrelevant")
+        expect(ActionMailer::Base.deliveries.first.to).to include(@assigned.email)
       end
 
       it "should send an email when the system marks a bug irrelevant" do
         @bug.update_attribute :irrelevant, true
 
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include("was marked irrelevant")
-        ActionMailer::Base.deliveries.first.to.should include(@assigned.email)
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include("was marked irrelevant")
+        expect(ActionMailer::Base.deliveries.first.to).to include(@assigned.email)
       end
 
       it "should not send an email when the assigned user marks a bug irrelevant" do
         @bug.modifier = @assigned
         @bug.update_attribute :irrelevant, true
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the bug is resolved" do
@@ -614,7 +614,7 @@
         ActionMailer::Base.deliveries.clear
         @bug.modifier = @resolver
         @bug.update_attribute :irrelevant, true
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the bug is marked irrelevant and no one is assigned" do
@@ -622,21 +622,21 @@
         ActionMailer::Base.deliveries.clear
         @bug.modifier = @resolver
         @bug.update_attribute :irrelevant, true
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the environment has email sending disabled" do
         @bug.environment.update_attribute :sends_emails, false
         @bug.modifier = @assigned
         @bug.update_attribute :assigned_user, @assigned
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the user has disabled resolution emails" do
         Membership.for(@assigned, @project).first.update_attribute :send_resolution_emails, false
         @bug.modifier = @resolver
         @bug.update_attribute :fixed, true
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
     end
 
@@ -650,10 +650,10 @@
         env     = FactoryGirl.create(:environment, project: project)
         bug     = FactoryGirl.create(:bug, environment: env)
 
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include(bug.class_name)
-        ActionMailer::Base.deliveries.first.subject.should include(File.basename(bug.file))
-        ActionMailer::Base.deliveries.first.to.should include('foo@example.com')
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include(bug.class_name)
+        expect(ActionMailer::Base.deliveries.first.subject).to include(File.basename(bug.file))
+        expect(ActionMailer::Base.deliveries.first.to).to include('foo@example.com')
       end
 
       it "should not send an email if no all-bugs mailing list is specified" do
@@ -661,14 +661,14 @@
         env     = FactoryGirl.create(:environment, project: project)
         bug     = FactoryGirl.create(:bug, environment: env)
 
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the environment has email sending disabled" do
         project = FactoryGirl.create(:project, all_mailing_list: 'foo@example.com')
         env     = FactoryGirl.create(:environment, project: project, sends_emails: false)
         bug     = FactoryGirl.create(:bug, environment: env)
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
     end
 
@@ -680,30 +680,30 @@
 
       it "should send an email to the blamed user" do
         @bug = FactoryGirl.build(:bug)
-        @bug.stub!(:blamed_email).and_return('foo@example.com')
-        @bug.stub!(:blamed_commit).and_return('abc123')
+        allow(@bug).to receive(:blamed_email).and_return('foo@example.com')
+        allow(@bug).to receive(:blamed_commit).and_return('abc123')
         @bug.save!
 
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include(@bug.class_name)
-        ActionMailer::Base.deliveries.first.subject.should include(File.basename(@bug.file))
-        ActionMailer::Base.deliveries.first.to.should include('foo@example.com')
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include(@bug.class_name)
+        expect(ActionMailer::Base.deliveries.first.subject).to include(File.basename(@bug.file))
+        expect(ActionMailer::Base.deliveries.first.to).to include('foo@example.com')
       end
 
       it "should not send an email if no one is to blame" do
         @bug = FactoryGirl.build(:bug)
-        @bug.stub!(:blamed_email).and_return(nil)
+        allow(@bug).to receive(:blamed_email).and_return(nil)
         @bug.save!
 
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if the environment has email sending disabled" do
         @bug = FactoryGirl.build(:bug, environment: FactoryGirl.create(:environment, sends_emails: false))
-        @bug.stub!(:blamed_email).and_return('foo@example.com')
+        allow(@bug).to receive(:blamed_email).and_return('foo@example.com')
         @bug.save!
 
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       # other specs in #blamed_email specs
@@ -718,28 +718,46 @@
 
       it "should send an email to the critical mailing list once when the threshold is exceeded" do
         FactoryGirl.create_list :rails_occurrence, 2, bug: @bug
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
 
         FactoryGirl.create :rails_occurrence, bug: @bug
-        ActionMailer::Base.deliveries.size.should eql(1)
-        ActionMailer::Base.deliveries.first.subject.should include(@bug.class_name)
-        ActionMailer::Base.deliveries.first.subject.should include(File.basename(@bug.file))
-        ActionMailer::Base.deliveries.first.to.should include('foo@example.com')
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+        expect(ActionMailer::Base.deliveries.first.subject).to include(@bug.class_name)
+        expect(ActionMailer::Base.deliveries.first.subject).to include(File.basename(@bug.file))
+        expect(ActionMailer::Base.deliveries.first.to).to include('foo@example.com')
 
         FactoryGirl.create :rails_occurrence, bug: @bug
-        ActionMailer::Base.deliveries.size.should eql(1)
+        expect(ActionMailer::Base.deliveries.size).to eql(1)
+      end
+
+      it "should not send an email if the bug is marked as irrelevant" do
+        FactoryGirl.create_list :rails_occurrence, 2, bug: @bug
+        @bug.update_attribute :irrelevant, true
+        expect(ActionMailer::Base.deliveries).to be_empty
+
+        FactoryGirl.create :rails_occurrence, bug: @bug
+        expect(ActionMailer::Base.deliveries).to be_empty
+      end
+
+      it "should not send an email if the bug is fixed" do
+        FactoryGirl.create_list :rails_occurrence, 2, bug: @bug
+        @bug.update_attribute :fixed, true
+        expect(ActionMailer::Base.deliveries).to be_empty
+
+        FactoryGirl.create :rails_occurrence, bug: @bug
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if no critical mailing list is specified" do
         @project.update_attribute :critical_mailing_list, nil
         FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
       it "should not send an email if no critical mailing list is specified" do
         @bug.environment.update_attribute :sends_emails, false
         FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
-        ActionMailer::Base.deliveries.should be_empty
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
     end
 
@@ -758,9 +776,9 @@
         @bug.update_attribute :notify_on_occurrence, [@user1, @user2].map(&:id)
         @occurrence = FactoryGirl.create(:rails_occurrence, bug: @bug)
 
-        ActionMailer::Base.deliveries.size.should eql(2)
-        ActionMailer::Base.deliveries.map(&:to).flatten.sort.should eql([@user1.email, @user2.email])
-        ActionMailer::Base.deliveries.each { |d| d.subject.should include('New occurrence') }
+        expect(ActionMailer::Base.deliveries.size).to eql(2)
+        expect(ActionMailer::Base.deliveries.map(&:to).flatten.sort).to eql([@user1.email, @user2.email])
+        ActionMailer::Base.deliveries.each { |d| expect(d.subject).to include('New occurrence') }
       end
     end
 
@@ -779,9 +797,9 @@
         @bug.update_attribute :notify_on_deploy, [@user1, @user2].map(&:id)
         @bug.update_attribute :fix_deployed, true
 
-        ActionMailer::Base.deliveries.size.should eql(2)
-        ActionMailer::Base.deliveries.map(&:to).flatten.sort.should eql([@user1.email, @user2.email])
-        ActionMailer::Base.deliveries.each { |d| d.subject.should include('was deployed') }
+        expect(ActionMailer::Base.deliveries.size).to eql(2)
+        expect(ActionMailer::Base.deliveries.map(&:to).flatten.sort).to match_array([@user1.email, @user2.email])
+        ActionMailer::Base.deliveries.each { |d| expect(d.subject).to include('was deployed') }
       end
     end
   end
@@ -796,21 +814,21 @@
     it "should automatically have the assignee watch the bug when assigned" do
       @user.watches.destroy_all
       @bug.update_attribute :assigned_user, @user
-      @user.watches.count.should eql(1)
-      @user.watches(true).first.bug_id.should eql(@bug.id)
+      expect(@user.watches.count).to eql(1)
+      expect(@user.watches(true).first.bug_id).to eql(@bug.id)
     end
 
     it "should do nothing if the assignee is already watching the bug" do
       @user.watches.destroy_all
       FactoryGirl.create :watch, user: @user, bug: @bug
       @bug.update_attribute :assigned_user, @user
-      @user.watches.count.should eql(1)
-      @user.watches(true).first.bug_id.should eql(@bug.id)
+      expect(@user.watches.count).to eql(1)
+      expect(@user.watches(true).first.bug_id).to eql(@bug.id)
     end
   end
 
   describe "#blamed_users" do
-    before :all do
+    before :each do
       @bug = FactoryGirl.create(:bug)
 
       @sean  = FactoryGirl.create(:user, first_name: 'Sean', last_name: 'Sorrell', username: 'ssorrell')
@@ -823,120 +841,120 @@
     end
 
     before(:each) do
-      @bug.stub!(:blamed_commit).and_return(mock('Git::Commit'))
-      @bug.blamed_commit.stub!(:author).and_return(mock('Git::Author'))
+      allow(@bug).to receive(:blamed_commit).and_return(double('Git::Commit'))
+      allow(@bug.blamed_commit).to receive(:author).and_return(double('Git::Author'))
     end
 
     it "should return the commit author email for known emails" do
-      @bug.blamed_commit.author.stub!(:email).and_return(@sean.email)
-      @bug.blamed_commit.author.stub!(:name).and_return(nil)
-      @bug.blamed_users.should eql([@sean.emails.primary.first])
+      allow(@bug.blamed_commit.author).to receive(:email).and_return(@sean.email)
+      allow(@bug.blamed_commit.author).to receive(:name).and_return(nil)
+      expect(@bug.blamed_users).to eql([@sean.emails.primary.first])
     end
 
     it "should match a single commit author by name" do
-      @bug.blamed_commit.author.stub!(:email).and_return("github+kliu@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Karen Liu")
-      @bug.blamed_users.should eql([@karen.emails.primary.first])
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+kliu@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Karen Liu")
+      expect(@bug.blamed_users).to eql([@karen.emails.primary.first])
     end
 
     it "should match multiple commit authors by name" do
-      @bug.blamed_commit.author.stub!(:email).and_return("github+ssorrell+lewis@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Sean Sorrell + Mike Lewis")
-      @bug.blamed_users.should eql([@sean.emails.primary.first, @lewis.emails.primary.first])
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+ssorrell+lewis@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Sean Sorrell + Mike Lewis")
+      expect(@bug.blamed_users).to eql([@sean.emails.primary.first, @lewis.emails.primary.first])
     end
 
     it "should match as many commit authors as it can" do
-      @bug.blamed_commit.author.stub!(:email).and_return("github+lewis+zach@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Mike Lewis & Zach Brock")
-      @bug.blamed_users.should eql([@lewis.emails.primary.first])
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+lewis+zach@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Mike Lewis & Zach Brock")
+      expect(@bug.blamed_users).to eql([@lewis.emails.primary.first])
     end
 
     it "should return an empty array if no matches can be found" do
-      @bug.blamed_commit.author.stub!(:email).and_return("github+ne+ek@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Nolan Evans + Erica Kwan")
-      @bug.blamed_users.should be_empty
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+ne+ek@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Nolan Evans + Erica Kwan")
+      expect(@bug.blamed_users).to be_empty
     end
 
     it "should use the commit author if the project is sending to unknown emails and there's an author match" do
       @bug.environment.project.sends_emails_outside_team = true
-      @bug.blamed_commit.author.stub!(:email).and_return("github+lewis+zach@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Mike Lewis & Zach Brock")
-      @bug.blamed_users.should eql([@lewis.emails.primary.first])
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+lewis+zach@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Mike Lewis & Zach Brock")
+      expect(@bug.blamed_users).to eql([@lewis.emails.primary.first])
     end
 
     it "should use the commit email if the project is sending to unknown emails and there's no author match" do
       @bug.environment.project.sends_emails_outside_team = true
-      @bug.blamed_commit.author.stub!(:email).and_return("github+ne+ek@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Nolan Evans + Erica Kwan")
-      @bug.blamed_users.size.should eql(1)
-      @bug.blamed_users.first.should be_kind_of(Email)
-      @bug.blamed_users.first.email.should eql("github+ne+ek@squareup.com")
-      @bug.blamed_users.first.user.should be_nil
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+ne+ek@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Nolan Evans + Erica Kwan")
+      expect(@bug.blamed_users.size).to eql(1)
+      expect(@bug.blamed_users.first).to be_kind_of(Email)
+      expect(@bug.blamed_users.first.email).to eql("github+ne+ek@squareup.com")
+      expect(@bug.blamed_users.first.user).to be_nil
     end
 
     it "should not use the commit email if the project is sending to unknown emails but the domain is not trusted" do
       @bug.environment.project.sends_emails_outside_team = true
       @bug.environment.project.trusted_email_domain      = 'paypal.com'
-      @bug.blamed_commit.author.stub!(:email).and_return("github+ne+ek@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Nolan Evans + Erica Kwan")
-      @bug.blamed_users.should be_empty
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+ne+ek@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Nolan Evans + Erica Kwan")
+      expect(@bug.blamed_users).to be_empty
     end
 
     it "should use the commit email if the project is sending to unknown emails and the domain is trusted" do
       @bug.environment.project.sends_emails_outside_team = true
       @bug.environment.project.trusted_email_domain      = 'squareup.com'
-      @bug.blamed_commit.author.stub!(:email).and_return("github+ne+ek@squareup.com")
-      @bug.blamed_commit.author.stub!(:name).and_return("Nolan Evans + Erica Kwan")
-      @bug.blamed_users.size.should eql(1)
-      @bug.blamed_users.first.should be_kind_of(Email)
-      @bug.blamed_users.first.email.should eql("github+ne+ek@squareup.com")
-      @bug.blamed_users.first.user.should be_nil
+      allow(@bug.blamed_commit.author).to receive(:email).and_return("github+ne+ek@squareup.com")
+      allow(@bug.blamed_commit.author).to receive(:name).and_return("Nolan Evans + Erica Kwan")
+      expect(@bug.blamed_users.size).to eql(1)
+      expect(@bug.blamed_users.first).to be_kind_of(Email)
+      expect(@bug.blamed_users.first.email).to eql("github+ne+ek@squareup.com")
+      expect(@bug.blamed_users.first.user).to be_nil
     end
 
     context "[redirection]" do
       before(:each) { Email.redirected.delete_all }
 
       it "should return a user who has specified that the commit author's emails be redirected to him" do
-        @bug.blamed_commit.author.stub!(:email).and_return(@sean.email)
+        allow(@bug.blamed_commit.author).to receive(:email).and_return(@sean.email)
         FactoryGirl.create(:email, email: @sean.email, user: @karen) # Karen took over Sean's exceptions
-        @bug.blamed_email.should eql(@karen.email)
+        expect(@bug.blamed_email).to eql(@karen.email)
       end
 
       it "should go deeper" do # BWWWWHHHHHHAAAAAAMMMMMMM
-        @bug.blamed_commit.author.stub!(:email).and_return(@sean.email)
+        allow(@bug.blamed_commit.author).to receive(:email).and_return(@sean.email)
         FactoryGirl.create(:email, email: @sean.email, user: @karen)  # Karen took over Sean's exceptions
         FactoryGirl.create(:email, email: @karen.email, user: @lewis) # ... then Mike took over Karen's exceptions
 
-        @bug.blamed_email.should eql(@lewis.email)
+        expect(@bug.blamed_email).to eql(@lewis.email)
       end
 
       it "should give priority to project-specific redirects" do
         erica = FactoryGirl.create(:user, first_name: 'Erica', last_name: 'Kwan', username: 'erica')
 
-        @bug.blamed_commit.author.stub!(:email).and_return(@sean.email)
+        allow(@bug.blamed_commit.author).to receive(:email).and_return(@sean.email)
         FactoryGirl.create(:email, email: @sean.email, user: erica)                                     # Erica took over all of Sean's exceptions
         FactoryGirl.create(:email, email: @sean.email, user: @karen, project: @bug.environment.project) # .. but Karen took over Sean's exceptions *on that project only*
         FactoryGirl.create(:email, email: @karen.email, user: @lewis)                                   # ... then Mike took over *all* of Karen's exceptions
 
-        @bug.blamed_email.should eql(@lewis.email)
+        expect(@bug.blamed_email).to eql(@lewis.email)
       end
 
       it "raise an exception for circular redirect chains" do
-        @bug.blamed_commit.author.stub!(:email).and_return(@sean.email)
+        allow(@bug.blamed_commit.author).to receive(:email).and_return(@sean.email)
         FactoryGirl.create(:email, email: @sean.email, user: @karen)  # Karen took over Sean's exceptions
         FactoryGirl.create(:email, email: @karen.email, user: @lewis) # ... then Mike took over Karen's exceptions
         FactoryGirl.create(:email, email: @lewis.email, user: @sean)  # ... but then Sean took over Mike's exceptions!
 
-        -> { @bug.blamed_email }.should raise_error(/Circular email redirection/)
+        expect { @bug.blamed_email }.to raise_error(/Circular email redirection/)
       end
 
       it "should email a user's corporate email if they commit with a personal email" do
-        @bug.blamed_commit.author.stub!(:email).and_return("karen.liu@gmail.com")
+        allow(@bug.blamed_commit.author).to receive(:email).and_return("karen.liu@gmail.com")
 
         # Karen has a tendency to commit under her gmail address
         FactoryGirl.create(:email, email: "karen.liu@gmail.com", user: @karen)
 
-        @bug.blamed_email.should eql(@karen.email)
+        expect(@bug.blamed_email).to eql(@karen.email)
       end
     end
   end
@@ -947,44 +965,44 @@
     it "should not allow a bug to be marked as duplicate of a bug that's already a duplicate" do
       already_duplicate_bug = FactoryGirl.create(:bug, environment: @env, duplicate_of: FactoryGirl.create(:bug, environment: @env))
       bug                   = FactoryGirl.build(:bug, environment: @env, duplicate_of: already_duplicate_bug)
-      bug.should_not be_valid
-      bug.errors[:duplicate_of_id].should eql(["cannot be the duplicate of a bug that’s marked as a duplicate"])
+      expect(bug).not_to be_valid
+      expect(bug.errors[:duplicate_of_id]).to eql(["cannot be the duplicate of a bug that’s marked as a duplicate"])
     end
 
     it "should not allow a bug to be marked as duplicate if another bug is marking this bug as a duplicate" do
       bug              = FactoryGirl.create(:bug, environment: @env)
       duplicate_of_bug = FactoryGirl.create(:bug, environment: @env, duplicate_of: bug)
       bug.duplicate_of = FactoryGirl.create(:bug, environment: @env)
-      bug.should_not be_valid
-      bug.errors[:duplicate_of_id].should eql(["cannot be marked as duplicate because other bugs have been marked as duplicates of this bug"])
+      expect(bug).not_to be_valid
+      expect(bug.errors[:duplicate_of_id]).to eql(["cannot be marked as duplicate because other bugs have been marked as duplicates of this bug"])
     end
 
     it "should allow a bug to NOT be marked as duplicate if another bug is marking this bug as a duplicate" do
       bug = FactoryGirl.create(:bug, environment: @env)
       FactoryGirl.create :bug, environment: @env, duplicate_of: bug
-      bug.should be_valid
+      expect(bug).to be_valid
     end
 
     it "should not allow a bug's duplicate-of ID to be changed" do
       bug              = FactoryGirl.create(:bug, environment: @env, duplicate_of: FactoryGirl.create(:bug, environment: @env))
       bug.duplicate_of = FactoryGirl.create(:bug, environment: @env)
-      bug.should_not be_valid
-      bug.errors[:duplicate_of_id].should eql(["already marked as duplicate of a bug"])
+      expect(bug).not_to be_valid
+      expect(bug.errors[:duplicate_of_id]).to eql(["already marked as duplicate of a bug"])
     end
 
     it "should not allow a bug to be marked as a duplicate of a bug in a different environment" do
       bug              = FactoryGirl.create(:bug, environment: @env)
       foreign_bug      = FactoryGirl.create(:bug)
       bug.duplicate_of = foreign_bug
-      bug.should_not be_valid
-      bug.errors[:duplicate_of_id].should eql(["can only be the duplicate of a bug in the same environment"])
+      expect(bug).not_to be_valid
+      expect(bug.errors[:duplicate_of_id]).to eql(["can only be the duplicate of a bug in the same environment"])
     end
 
     it "should not allow a bug to be un-marked as a duplicate" do
       bug              = FactoryGirl.create(:bug, environment: @env, duplicate_of: FactoryGirl.create(:bug, environment: @env))
       bug.duplicate_of = nil
-      bug.should_not be_valid
-      bug.errors[:duplicate_of_id].should eql(["already marked as duplicate of a bug"])
+      expect(bug).not_to be_valid
+      expect(bug.errors[:duplicate_of_id]).to eql(["already marked as duplicate of a bug"])
     end
 
     describe "#mark_as_duplicate!" do
@@ -995,7 +1013,7 @@
         duplicate = FactoryGirl.create(:bug, environment: @env)
 
         duplicate.mark_as_duplicate! bug
-        duplicate.duplicate_of.should eql(bug)
+        expect(duplicate.duplicate_of).to eql(bug)
       end
 
       it "should move all occurrences" do
@@ -1004,8 +1022,35 @@
         occurrences = 5.times.map { FactoryGirl.create :rails_occurrence, bug: duplicate }
 
         duplicate.mark_as_duplicate! bug
-        occurrences.map(&:reload).map(&:bug_id).should eql([bug.id]*5)
+        expect(occurrences.map(&:reload).map(&:bug_id)).to eql([bug.id]*5)
       end
     end
   end
+
+  describe "#page_threshold_tripped?" do
+    before :each do
+      @bug = FactoryGirl.create(:bug, page_threshold: 10, page_period: 10.minutes, page_last_tripped_at: 20.minutes.ago)
+    end
+
+    it "should return false if a threshold or period has not been configured" do
+      expect(FactoryGirl.build(:bug, page_threshold: 10, page_period: nil)).not_to be_page_threshold_tripped
+      expect(FactoryGirl.build(:bug, page_threshold: nil, page_period: 1.minute)).not_to be_page_threshold_tripped
+    end
+
+    it "should return false if the threshold has not yet been exceeded within the period" do
+      FactoryGirl.create_list :rails_occurrence, 9, bug: @bug
+      expect(@bug).not_to be_page_threshold_tripped
+    end
+
+    it "should return true if the threshold has been exceeded within the period" do
+      FactoryGirl.create_list :rails_occurrence, 10, bug: @bug
+      expect(@bug).to be_page_threshold_tripped
+    end
+
+    it "should return false if the threshold was tripped within the last period" do
+      FactoryGirl.create_list :rails_occurrence, 10, bug: @bug
+      @bug.page_last_tripped_at = 45.seconds.ago
+      expect(@bug).not_to be_page_threshold_tripped
+    end
+  end
 end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index b3dda0ae..62241c6d 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Comment do
+RSpec.describe Comment, type: :comment do
   context "[database rules]" do
     it "should set number sequentially for a given bug" do
       bug1  = FactoryGirl.create(:bug)
@@ -29,10 +29,10 @@
       comment2_1 = FactoryGirl.create(:comment, bug: bug2, user: user2)
       comment2_2 = FactoryGirl.create(:comment, bug: bug2, user: user2)
 
-      comment1_1.number.should eql(1)
-      comment1_2.number.should eql(2)
-      comment2_1.number.should eql(1)
-      comment2_2.number.should eql(2)
+      expect(comment1_1.number).to eql(1)
+      expect(comment1_2.number).to eql(2)
+      expect(comment2_1.number).to eql(1)
+      expect(comment2_2.number).to eql(2)
     end
 
     it "should not reuse deleted numbers" do
@@ -47,15 +47,15 @@
       c = FactoryGirl.create(:comment, bug: bug, user: bug.environment.project.owner)
       FactoryGirl.create :comment, bug: bug, user: bug.environment.project.owner
       c.destroy
-      FactoryGirl.create(:comment, bug: bug, user: bug.environment.project.owner).number.should eql(4)
+      expect(FactoryGirl.create(:comment, bug: bug, user: bug.environment.project.owner).number).to eql(4)
     end
   end
 
   context "[validations]" do
     it "should only allow permitted users to leave comments" do
       comment = FactoryGirl.build(:comment, bug: FactoryGirl.create(:bug))
-      comment.should_not be_valid
-      comment.errors[:bug_id].should eql(["You don’t have permission to comment on this bug."])
+      expect(comment).not_to be_valid
+      expect(comment.errors[:bug_id]).to eql(["You don’t have permission to comment on this bug."])
     end
   end
 
@@ -63,9 +63,9 @@
     it "should create an event when created" do
       comment = FactoryGirl.create(:comment)
       event   = comment.bug.events.last
-      event.kind.should eql('comment')
-      event.data['comment_id'].should eql(comment.id)
-      event.user.should eql(comment.user)
+      expect(event.kind).to eql('comment')
+      expect(event.data['comment_id']).to eql(comment.id)
+      expect(event.user).to eql(comment.user)
     end
 
     it "should destroy related events when deleted" do
@@ -75,8 +75,8 @@
       FactoryGirl.create(:comment, bug: comment.bug, user: comment.user)
       red_herring = comment.bug.events(true).last
       comment.destroy
-      -> { event.reload }.should raise_error(ActiveRecord::RecordNotFound)
-      -> { red_herring.reload }.should_not raise_error
+      expect { event.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { red_herring.reload }.not_to raise_error
     end
   end
 
@@ -96,23 +96,23 @@
 
     it "should send an email to the assigned user and all previous commenters when someone comments on a bug" do
       FactoryGirl.create :comment, bug: @bug, user: @cur_commenter
-      ActionMailer::Base.deliveries.size.should eql(2)
-      ActionMailer::Base.deliveries.map(&:to).flatten.sort.should eql([@assigned.email, @prev_commenter.email])
-      ActionMailer::Base.deliveries.each { |d| d.subject.should include("A comment has been added") }
+      expect(ActionMailer::Base.deliveries.size).to eql(2)
+      expect(ActionMailer::Base.deliveries.map(&:to).flatten.sort).to eql([@assigned.email, @prev_commenter.email])
+      ActionMailer::Base.deliveries.each { |d| expect(d.subject).to include("A comment has been added") }
     end
 
     it "should not send an email to the assigned user if the assigned user was the commenter" do
       FactoryGirl.create :comment, bug: @bug, user: @assigned
-      ActionMailer::Base.deliveries.size.should eql(1)
-      ActionMailer::Base.deliveries.first.to.should eql([@prev_commenter.email])
-      ActionMailer::Base.deliveries.first.subject.should include("A comment has been added")
+      expect(ActionMailer::Base.deliveries.size).to eql(1)
+      expect(ActionMailer::Base.deliveries.first.to).to eql([@prev_commenter.email])
+      expect(ActionMailer::Base.deliveries.first.subject).to include("A comment has been added")
     end
 
     it "should not send an email to the author even if the author has previously commented" do
       FactoryGirl.create :comment, bug: @bug, user: @prev_commenter
-      ActionMailer::Base.deliveries.size.should eql(1)
-      ActionMailer::Base.deliveries.first.to.should eql([@assigned.email])
-      ActionMailer::Base.deliveries.first.subject.should include("A comment has been added")
+      expect(ActionMailer::Base.deliveries.size).to eql(1)
+      expect(ActionMailer::Base.deliveries.first.to).to eql([@assigned.email])
+      expect(ActionMailer::Base.deliveries.first.subject).to include("A comment has been added")
     end
 
     it "should send only one email to the assigned user if the assigned user has previously commented on the bug" do
@@ -120,32 +120,32 @@
       ActionMailer::Base.deliveries.clear
 
       FactoryGirl.create :comment, bug: @bug, user: @cur_commenter
-      ActionMailer::Base.deliveries.size.should eql(2)
-      ActionMailer::Base.deliveries.map(&:to).flatten.sort.should eql([@assigned.email, @prev_commenter.email])
-      ActionMailer::Base.deliveries.each { |d| d.subject.should include("A comment has been added") }
+      expect(ActionMailer::Base.deliveries.size).to eql(2)
+      expect(ActionMailer::Base.deliveries.map(&:to).flatten.sort).to eql([@assigned.email, @prev_commenter.email])
+      ActionMailer::Base.deliveries.each { |d| expect(d.subject).to include("A comment has been added") }
     end
 
     it "should not send an email if the environment is configured not to send emails" do
       @bug.environment.update_attribute :sends_emails, false
       FactoryGirl.create :comment, bug: @bug, user: @cur_commenter
-      ActionMailer::Base.deliveries.should be_empty
+      expect(ActionMailer::Base.deliveries).to be_empty
     end
 
     it "should not send an email if the recipient has turned off comment emails (assigned user)" do
       Membership.for(@assigned, @project).first.update_attribute :send_comment_emails, false
       FactoryGirl.create :comment, bug: @bug, user: @cur_commenter
-      ActionMailer::Base.deliveries.size.should eql(1)
-      ActionMailer::Base.deliveries.first.to.should eql([@prev_commenter.email])
-      ActionMailer::Base.deliveries.first.subject.should include("A comment has been added")
+      expect(ActionMailer::Base.deliveries.size).to eql(1)
+      expect(ActionMailer::Base.deliveries.first.to).to eql([@prev_commenter.email])
+      expect(ActionMailer::Base.deliveries.first.subject).to include("A comment has been added")
     end
 
     it "should not send an email if the recipient has turned off comment emails (commenter)" do
       Membership.for(@assigned, @project).first.update_attribute :send_comment_emails, true
       Membership.for(@prev_commenter, @project).first.update_attribute :send_comment_emails, false
       FactoryGirl.create :comment, bug: @bug, user: @cur_commenter
-      ActionMailer::Base.deliveries.size.should eql(1)
-      ActionMailer::Base.deliveries.first.to.should eql([@assigned.email])
-      ActionMailer::Base.deliveries.first.subject.should include("A comment has been added")
+      expect(ActionMailer::Base.deliveries.size).to eql(1)
+      expect(ActionMailer::Base.deliveries.first.to).to eql([@assigned.email])
+      expect(ActionMailer::Base.deliveries.first.subject).to include("A comment has been added")
     end
   end
 
@@ -159,16 +159,16 @@
     it "should automatically have the author watch the bug" do
       @user.watches.destroy_all
       FactoryGirl.create :comment, user: @user, bug: @bug
-      @user.watches.count.should eql(1)
-      @user.watches(true).first.bug_id.should eql(@bug.id)
+      expect(@user.watches.count).to eql(1)
+      expect(@user.watches(true).first.bug_id).to eql(@bug.id)
     end
 
     it "should do nothing if the author is already watching the bug" do
       @user.watches.destroy_all
       FactoryGirl.create :watch, user: @user, bug: @bug
       FactoryGirl.create :comment, user: @user, bug: @bug
-      @user.watches.count.should eql(1)
-      @user.watches(true).first.bug_id.should eql(@bug.id)
+      expect(@user.watches.count).to eql(1)
+      expect(@user.watches(true).first.bug_id).to eql(@bug.id)
     end
   end
 end
diff --git a/spec/models/deploy_spec.rb b/spec/models/deploy_spec.rb
index 019402fa..9fbec720 100644
--- a/spec/models/deploy_spec.rb
+++ b/spec/models/deploy_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,23 +12,23 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Deploy do
+RSpec.describe Deploy, type: :model do
   context "[hooks]" do
     it "should queue up a DeployFixMarker job" do
       if RSpec.configuration.use_transactional_fixtures
         pending "This is done in an after_commit hook, and it can't be tested with transactional fixtures (which are always rolled back)"
       end
 
-      Project.where(repository_url: "https://github.com/RISCfuture/better_caller.git").delete_all
-      project     = FactoryGirl.create(:project, repository_url: "https://github.com/RISCfuture/better_caller.git")
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      project     = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
       environment = FactoryGirl.create(:environment, project: project)
       deploy      = FactoryGirl.build(:deploy, environment: environment)
 
-      dfm = mock('DeployFixMarker')
-      DeployFixMarker.should_receive(:new).once.with(deploy).and_return(dfm)
-      dfm.should_receive(:perform).once
+      dfm = double('DeployFixMarker')
+      expect(DeployFixMarker).to receive(:new).once.with(deploy).and_return(dfm)
+      expect(dfm).to receive(:perform).once
 
       deploy.save!
     end
@@ -39,20 +39,20 @@
       it "should set it to true if a release is created" do
         @env.project.update_attribute :uses_releases, false
         FactoryGirl.create :release, environment: @env
-        @env.project(true).uses_releases?.should be_true
+        expect(@env.project(true).uses_releases?).to eql(true)
       end
 
       it "should not set it to false if there is a subsequent deploy" do
         @env.project(true).update_attribute :uses_releases, true
         FactoryGirl.create :deploy, environment: @env
-        @env.project.uses_releases?.should be_true
+        expect(@env.project.uses_releases?).to eql(true)
       end
 
       it "should not set it to true if the override is set" do
         @env.project.uses_releases = false
         @env.project.uses_releases_override = true
         FactoryGirl.create :release, environment: @env
-        @env.project(true).uses_releases?.should be_false
+        expect(@env.project(true).uses_releases?).to eql(false)
       end
     end
   end
@@ -61,11 +61,11 @@
     before(:all) { @env = FactoryGirl.create(:environment) }
 
     it "should return true for a release" do
-      FactoryGirl.create(:release, environment: @env).should be_release
+      expect(FactoryGirl.create(:release, environment: @env)).to be_release
     end
 
     it "should return false for a deploy" do
-      FactoryGirl.create(:deploy, environment: @env).should_not be_release
+      expect(FactoryGirl.create(:deploy, environment: @env)).not_to be_release
     end
   end
 
@@ -75,24 +75,24 @@
       bug1 = FactoryGirl.create :bug, deploy: deploy
       bug2 = FactoryGirl.create :bug, deploy: deploy
 
-      deploy.devices_affected.should == 0
+      expect(deploy.devices_affected).to eq(0)
 
       FactoryGirl.create :rails_occurrence, bug: bug1, device_id: 'hello'
       FactoryGirl.create :rails_occurrence, bug: bug1, device_id: 'hello'
 
-      deploy.devices_affected.should == 1
+      expect(deploy.devices_affected).to eq(1)
 
       FactoryGirl.create :rails_occurrence, bug: bug2, device_id: 'goodbye'
 
-      deploy.devices_affected.should == 2
+      expect(deploy.devices_affected).to eq(2)
 
       FactoryGirl.create :rails_occurrence, bug: bug1, device_id: 'goodbye'
 
-      deploy.devices_affected.should == 2
+      expect(deploy.devices_affected).to eq(2)
 
       FactoryGirl.create :rails_occurrence, bug: bug1, device_id: 'one more'
 
-      deploy.devices_affected.should == 3
+      expect(deploy.devices_affected).to eq(3)
     end
   end
 end
diff --git a/spec/models/device_bug_spec.rb b/spec/models/device_bug_spec.rb
index 73969afc..a4a70d33 100644
--- a/spec/models/device_bug_spec.rb
+++ b/spec/models/device_bug_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe DeviceBug do
+RSpec.describe DeviceBug, type: :model do
 end
diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb
index 387c0c9e..7615a92a 100644
--- a/spec/models/email_spec.rb
+++ b/spec/models/email_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,89 +12,91 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Email do
+RSpec.describe Email, type: :model do
   context "[validations]" do
     it "should not allow a primary email to be downgraded" do
       email         = FactoryGirl.create(:email, primary: true)
       email.primary = false
-      email.should_not be_valid
-      email.errors[:primary].should eql(['cannot be unset without setting another email as primary'])
+      expect(email).not_to be_valid
+      expect(email.errors[:primary]).to eql(['cannot be unset without setting another email as primary'])
     end
 
     it "should only allow one user to assume redirect ownership of another's primary email" do
       old_user = FactoryGirl.create(:user)
       FactoryGirl.create :email, email: old_user.email
       email = FactoryGirl.build(:email, email: old_user.email)
-      email.should_not be_valid
-      email.errors[:email].should eql(['is already being handled by someone else'])
+      expect(email).not_to be_valid
+      expect(email.errors[:email]).to eql(['is already being handled by someone else'])
     end
 
     it "should allow a user to assume ownership of an otherwise unknown email" do
       email = FactoryGirl.build(:email, email: 'heretoforeunknown@email.com')
-      email.should be_valid
+      expect(email).to be_valid
     end
 
     it "should not allow a user to assume redirect ownership of his/hera primary email" do
       user  = FactoryGirl.create(:user)
       email = FactoryGirl.build(:email, email: user.email, user: user)
-      email.should_not be_valid
-      email.errors[:email].should eql(['is already your main email address'])
+      expect(email).not_to be_valid
+      expect(email.errors[:email]).to eql(['is already your main email address'])
     end
 
     it "should not allow a user to assume redirect ownership of an email twice" do
       old_user  = FactoryGirl.create(:user)
       redirect1 = FactoryGirl.create(:email, email: old_user.email)
       redirect2 = FactoryGirl.build(:email, email: old_user.email, user: redirect1.user)
-      redirect2.should_not be_valid
-      redirect2.errors[:email].should include('is already being handled by someone else')
+      expect(redirect2).not_to be_valid
+      expect(redirect2.errors[:email]).to include('is already being handled by someone else')
     end
 
     it "should not allow a user to assume redirect ownership of an email within a project that he has global redirect ownership of" do
       user          = FactoryGirl.create(:user)
       global_email  = FactoryGirl.create(:email, user: user)
       project_email = FactoryGirl.build(:email, user: user, email: global_email.email, project: FactoryGirl.create(:membership, user: user).project)
-      project_email.should_not be_valid
-      project_email.errors[:email].should eql(['is already globally handled by you'])
+      expect(project_email).not_to be_valid
+      expect(project_email.errors[:email]).to eql(['is already globally handled by you'])
     end
 
     it "should allow a user to assume redirect ownership of an email within a project that someone else has global redirect ownership of" do
       user          = FactoryGirl.create(:user)
       global_email  = FactoryGirl.create(:email)
       project_email = FactoryGirl.build(:email, user: user, email: global_email.email, project: FactoryGirl.create(:membership, user: user).project)
-      project_email.should be_valid
+      expect(project_email).to be_valid
     end
 
     it "should not allow a user to assume redirect ownership of an email for a project he is not a member of" do
       email = FactoryGirl.build(:email, project: FactoryGirl.create(:project))
-      email.should_not be_valid
-      email.errors[:project_id].should eql(['not a member'])
+      expect(email).not_to be_valid
+      expect(email.errors[:project_id]).to eql(['not a member'])
     end
 
     it "should remove project-specific redirect ownership for emails the user claims global ownership of" do
       user          = FactoryGirl.create(:user)
       project_email = FactoryGirl.create(:email, user: user, project: FactoryGirl.create(:membership, user: user).project)
       global_email  = FactoryGirl.create(:email, email: project_email.email, user: user)
-      user.emails.redirected.pluck(:id).should eql([global_email.id])
+      expect(user.emails.redirected.pluck(:id)).to eql([global_email.id])
     end
 
     it "should not remove project-specific redirect ownership for emails the another user claims global ownership of" do
       user          = FactoryGirl.create(:user)
       project_email = FactoryGirl.create(:email, user: user, project: FactoryGirl.create(:membership, user: user).project)
       global_email  = FactoryGirl.create(:email, email: project_email.email)
-      user.emails.redirected.pluck(:id).should eql([project_email.id])
+      expect(user.emails.redirected.pluck(:id)).to eql([project_email.id])
     end
   end
 
   context "[hooks]" do
     it "should downgrade another primary email when set as primary" do
+      Email.delete_all
+
       user  = FactoryGirl.create(:user)
       email = user.emails.first
-      email.should be_primary
+      expect(email).to be_primary
 
       FactoryGirl.create(:email, user: user, primary: true)
-      email.reload.should_not be_primary
+      expect(email.reload).not_to be_primary
     end
   end
 end
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index b96ba3b9..e87957b4 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,30 +12,30 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Environment do
+RSpec.describe Environment, type: :model do
   context "[triggers]" do
     before(:all) { @env = FactoryGirl.create(:environment) }
     before(:each) { Bug.delete_all }
 
     it "should increment the cached counter when a new bug is added" do
       FactoryGirl.create :bug, environment: @env
-      @env.reload.bugs_count.should eql(1)
+      expect(@env.reload.bugs_count).to eql(1)
     end
 
     it "should not increment the cached counter when a new closed bug is added" do
       FactoryGirl.create :bug, environment: @env, fixed: true
-      @env.reload.bugs_count.should eql(0)
+      expect(@env.reload.bugs_count).to eql(0)
 
       FactoryGirl.create :bug, environment: @env, irrelevant: true
-      @env.reload.bugs_count.should eql(0)
+      expect(@env.reload.bugs_count).to eql(0)
     end
 
     it "should decrement the cached counter when an open bug is deleted" do
       bug = FactoryGirl.create(:bug, environment: @env)
       bug.destroy
-      @env.reload.bugs_count.should eql(0)
+      expect(@env.reload.bugs_count).to eql(0)
     end
 
     it "should not decrement the cached counter when a closed bug is deleted" do
@@ -43,32 +43,32 @@
       
       bug = FactoryGirl.create(:bug, environment: @env, fixed: true)
       bug.destroy
-      @env.reload.bugs_count.should eql(2)
+      expect(@env.reload.bugs_count).to eql(2)
       bug = FactoryGirl.create(:bug, environment: @env, irrelevant: true)
       bug.destroy
-      @env.reload.bugs_count.should eql(2)
+      expect(@env.reload.bugs_count).to eql(2)
     end
 
     it "should increment the cached counter when a bug is opened" do
       bug1 = FactoryGirl.create(:bug, environment: @env, fixed: true)
       bug2 = FactoryGirl.create(:bug, environment: @env, irrelevant: true)
-      @env.reload.bugs_count.should eql(0)
+      expect(@env.reload.bugs_count).to eql(0)
 
       bug1.update_attribute :fixed, false
-      @env.reload.bugs_count.should eql(1)
+      expect(@env.reload.bugs_count).to eql(1)
       bug2.update_attribute :irrelevant, false
-      @env.reload.bugs_count.should eql(2)
+      expect(@env.reload.bugs_count).to eql(2)
     end
 
     it "should decrement the cached counter when a bug is closed" do
       bug1 = FactoryGirl.create(:bug, environment: @env)
       bug2 = FactoryGirl.create(:bug, environment: @env)
-      @env.reload.bugs_count.should eql(2)
+      expect(@env.reload.bugs_count).to eql(2)
 
       bug1.update_attribute :fixed, true
-      @env.reload.bugs_count.should eql(1)
+      expect(@env.reload.bugs_count).to eql(1)
       bug2.update_attribute :irrelevant, true
-      @env.reload.bugs_count.should eql(0)
+      expect(@env.reload.bugs_count).to eql(0)
     end
   end
 end
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index f1c22d29..c83e0237 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Event do
+RSpec.describe Event, type: :model do
   describe "#as_json" do
     before :all do
       m           = FactoryGirl.create(:membership)
@@ -24,48 +24,48 @@
     end
 
     it "should return the correct fields for an open event" do
-      FactoryGirl.build(:event, bug: @bug, kind: 'open').as_json.should eql(kind: 'open', created_at: nil)
+      expect(FactoryGirl.build(:event, bug: @bug, kind: 'open').as_json).to eql(kind: 'open', created_at: nil)
     end
 
     it "should return the correct fields for a comment event" do
       comment = FactoryGirl.create(:comment, bug: @bug, user: FactoryGirl.create(:membership, project: @bug.environment.project).user)
 
-      FactoryGirl.build(:event, bug: @bug, kind: 'comment', data: {'comment_id' => comment.id}, user: @user).as_json.
-          should eql(kind: 'comment', comment: comment.as_json, user: @user.as_json, created_at: nil)
+      expect(FactoryGirl.build(:event, bug: @bug, kind: 'comment', data: {'comment_id' => comment.id}, user: @user).as_json).
+          to eql(kind: 'comment', comment: comment.as_json, user: @user.as_json, created_at: nil)
     end
 
     it "should return the correct fields for an assign event" do
       assignee = FactoryGirl.create(:user)
 
-      FactoryGirl.build(:event, bug: @bug, kind: 'assign', data: {'assignee_id' => assignee.id}, user: @user).as_json.
-          should eql(kind: 'assign', assigner: @user.as_json, assignee: assignee.as_json, created_at: nil)
+      expect(FactoryGirl.build(:event, bug: @bug, kind: 'assign', data: {'assignee_id' => assignee.id}, user: @user).as_json).
+          to eql(kind: 'assign', assigner: @user.as_json, assignee: assignee.as_json, created_at: nil)
     end
 
     it "should return the correct fields for a close event" do
-      FactoryGirl.build(:event, bug: @bug, kind: 'close', user: @user, data: {'status' => 'irrelevant', 'revision' => 'abc123', 'issue' => 'FOO-123'}).as_json.
-          should eql(kind: 'close', user: @user.as_json, status: 'irrelevant', revision: 'abc123', created_at: nil, issue: 'FOO-123')
+      expect(FactoryGirl.build(:event, bug: @bug, kind: 'close', user: @user, data: {'status' => 'irrelevant', 'revision' => 'abc123', 'issue' => 'FOO-123'}).as_json).
+          to eql(kind: 'close', user: @user.as_json, status: 'irrelevant', revision: 'abc123', created_at: nil, issue: 'FOO-123')
     end
 
     it "should return the correct fields for a reopen event" do
-      FactoryGirl.build(:event, bug: @bug, kind: 'reopen', user: @user, data: {'occurrence_id' => @occurrence.id, 'from' => 'irrelevant'}).as_json.
-          should eql(kind: 'reopen', user: @user.as_json, occurrence: @occurrence.as_json, from: 'irrelevant', created_at: nil)
+      expect(FactoryGirl.build(:event, bug: @bug, kind: 'reopen', user: @user, data: {'occurrence_id' => @occurrence.id, 'from' => 'irrelevant'}).as_json).
+          to eql(kind: 'reopen', user: @user.as_json, occurrence: @occurrence.as_json, from: 'irrelevant', created_at: nil)
     end
 
     it "should return the correct fields for a deploy event" do
-      FactoryGirl.build(:event, bug: @bug, kind: 'deploy', data: {'build' => '10010', 'revision' => 'c6293262d8d706bd8b4344b4c6deae3cde6e6434'}).as_json.
-          should eql(kind: 'deploy', revision: 'c6293262d8d706bd8b4344b4c6deae3cde6e6434', build: '10010', created_at: nil)
+      expect(FactoryGirl.build(:event, bug: @bug, kind: 'deploy', data: {'build' => '10010', 'revision' => 'c6293262d8d706bd8b4344b4c6deae3cde6e6434'}).as_json).
+          to eql(kind: 'deploy', revision: 'c6293262d8d706bd8b4344b4c6deae3cde6e6434', build: '10010', created_at: nil)
     end
 
     it "should return the correct fields for an email event" do
-      FactoryGirl.build(:event, bug: @bug, kind: 'email', data: {'recipients' => %w(foo@bar.com)}).as_json.
-          should eql(kind: 'email', recipients: %w(foo@bar.com), created_at: nil)
+      expect(FactoryGirl.build(:event, bug: @bug, kind: 'email', data: {'recipients' => %w(foo@bar.com)}).as_json).
+          to eql(kind: 'email', recipients: %w(foo@bar.com), created_at: nil)
     end
 
     it "should return the correct fields for a dupe event" do
       original = FactoryGirl.create(:bug)
       dupe     = FactoryGirl.create(:bug, duplicate_of: original, environment: original.environment)
-      FactoryGirl.build(:event, bug: dupe, kind: 'dupe', user: @user).as_json.
-          should eql(kind: 'dupe', user: @user.as_json, original: original.as_json, created_at: nil)
+      expect(FactoryGirl.build(:event, bug: dupe, kind: 'dupe', user: @user).as_json).
+          to eql(kind: 'dupe', user: @user.as_json, original: original.as_json, created_at: nil)
     end
   end
 
@@ -77,9 +77,9 @@
 
       event.save!
       ues = event.user_events.pluck(:user_id)
-      ues.size.should eql(2)
-      ues.should include(watch1.user_id)
-      ues.should include(watch2.user_id)
+      expect(ues.size).to eql(2)
+      expect(ues).to include(watch1.user_id)
+      expect(ues).to include(watch2.user_id)
     end
   end
 end
diff --git a/spec/models/membership_spec.rb b/spec/models/membership_spec.rb
index 2372a5ce..79d94d69 100644
--- a/spec/models/membership_spec.rb
+++ b/spec/models/membership_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Membership do
+RSpec.describe Membership, type: :model do
   # nothing yet
 end
diff --git a/spec/models/notification_threshold_spec.rb b/spec/models/notification_threshold_spec.rb
index 090f15fd..487d42d5 100644
--- a/spec/models/notification_threshold_spec.rb
+++ b/spec/models/notification_threshold_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,28 +12,28 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe NotificationThreshold do
+RSpec.describe NotificationThreshold, type: :model do
   describe "#tripped?" do
-    before :all do
-      @threshold = FactoryGirl.create(:notification_threshold, threshold: 10, period: 1.minute, last_tripped_at: 2.minutes.ago)
+    before :each do
+      @threshold = FactoryGirl.create(:notification_threshold, threshold: 10, period: 10.minutes, last_tripped_at: 20.minutes.ago)
     end
 
     it "should return false if the threshold has not yet been exceeded within the period" do
       FactoryGirl.create_list :rails_occurrence, 9, bug: @threshold.bug
-      @threshold.should_not be_tripped
+      expect(@threshold).not_to be_tripped
     end
 
     it "should return true if the threshold has been exceeded within the period" do
       FactoryGirl.create_list :rails_occurrence, 10, bug: @threshold.bug
-      @threshold.should be_tripped
+      expect(@threshold).to be_tripped
     end
 
     it "should return false if the threshold was tripped within the last period" do
       FactoryGirl.create_list :rails_occurrence, 10, bug: @threshold.bug
       @threshold.last_tripped_at = 45.seconds.ago
-      @threshold.should_not be_tripped
+      expect(@threshold).not_to be_tripped
     end
   end
 end
diff --git a/spec/models/obfuscation_map_spec.rb b/spec/models/obfuscation_map_spec.rb
index 589e73ec..2104dc37 100644
--- a/spec/models/obfuscation_map_spec.rb
+++ b/spec/models/obfuscation_map_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe ObfuscationMap do
+RSpec.describe ObfuscationMap, type: :model do
   context "[hooks]" do
     it "should deobfuscate pending occurrences when created" do
       if RSpec.configuration.use_transactional_fixtures
@@ -22,7 +22,7 @@
       end
 
       Project.delete_all
-      project = FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git')
+      project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
       env     = FactoryGirl.create(:environment, project: project)
 
       bug        = FactoryGirl.create(:bug,
@@ -44,15 +44,15 @@
                                                                      "line"   => 15,
                                                                      "symbol" => "int b(int)",
                                                                      "class_name"  => "com.A.B"}]}])
-      occurrence.should_not be_deobfuscated
+      expect(occurrence).not_to be_deobfuscated
 
       namespace = Squash::Java::Namespace.new
       namespace.add_package_alias 'com.foo', 'A'
       namespace.add_class_alias('com.foo.Bar', 'B').path = 'src/foo/Bar.java'
       namespace.add_method_alias 'com.foo.Bar', 'int foo(int)', 'b'
       FactoryGirl.create :obfuscation_map, namespace: namespace, deploy: bug.deploy
-      occurrence.reload.should be_deobfuscated
-      occurrence.redirect_target_id.should be_nil
+      expect(occurrence.reload).to be_deobfuscated
+      expect(occurrence.redirect_target_id).to be_nil
     end
 
     it "should reassign to another bug if blame changes" do
@@ -61,7 +61,7 @@
       end
 
       Project.delete_all
-      project = FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git')
+      project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
       env     = FactoryGirl.create(:environment, project: project)
 
       bug1 = FactoryGirl.create(:bug,
@@ -94,9 +94,9 @@
       namespace.add_method_alias 'com.foo.Bar', 'int foo(int)', 'b'
       FactoryGirl.create :obfuscation_map, namespace: namespace, deploy: bug1.deploy
 
-      bug2.occurrences.count.should eql(1)
+      expect(bug2.occurrences.count).to eql(1)
       o2 = bug2.occurrences.first
-      occurrence.reload.redirect_target_id.should eql(o2.id)
+      expect(occurrence.reload.redirect_target_id).to eql(o2.id)
     end
   end
 end
diff --git a/spec/models/occurrence_spec.rb b/spec/models/occurrence_spec.rb
index e02c472b..29429b1a 100644
--- a/spec/models/occurrence_spec.rb
+++ b/spec/models/occurrence_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Occurrence do
+RSpec.describe Occurrence, type: :model do
   context "[database rules]" do
     it "should set number sequentially for a given bug" do
       bug1 = FactoryGirl.create(:bug)
@@ -25,10 +25,10 @@
       occurrence2_1 = FactoryGirl.create(:rails_occurrence, bug: bug2)
       occurrence2_2 = FactoryGirl.create(:rails_occurrence, bug: bug2)
 
-      occurrence1_1.number.should eql(1)
-      occurrence1_2.number.should eql(2)
-      occurrence2_1.number.should eql(1)
-      occurrence2_2.number.should eql(2)
+      expect(occurrence1_1.number).to eql(1)
+      expect(occurrence1_2.number).to eql(2)
+      expect(occurrence2_1.number).to eql(1)
+      expect(occurrence2_2.number).to eql(2)
     end
 
     it "should not reuse deleted numbers" do
@@ -43,12 +43,12 @@
       c = FactoryGirl.create(:rails_occurrence, bug: bug)
       FactoryGirl.create :rails_occurrence, bug: bug
       c.destroy
-      FactoryGirl.create(:rails_occurrence, bug: bug).number.should eql(4)
+      expect(FactoryGirl.create(:rails_occurrence, bug: bug).number).to eql(4)
     end
 
     it "should set the parent's first occurrence if necessary" do
       o = FactoryGirl.create(:rails_occurrence)
-      o.bug.first_occurrence.should eql(o.occurred_at)
+      expect(o.bug.first_occurrence).to eql(o.occurred_at)
     end
   end
 
@@ -57,18 +57,18 @@
       symbols = Squash::Symbolicator::Symbols.new
       symbols.add 1, 10, 'foo.rb', 5, 'bar'
       symb = FactoryGirl.create(:symbolication, symbols: symbols)
-      FactoryGirl.create(:rails_occurrence,
-                         symbolication: symb,
-                         backtraces:    [{"name"      => "1",
-                                          "faulted"   => true,
-                                          "backtrace" => [{"type"    => "address",
-                                                           "address" => 5}]}]).
-          should be_symbolicated
+      expect(FactoryGirl.create(:rails_occurrence,
+                                symbolication: symb,
+                                backtraces:    [{"name"      => "1",
+                                                 "faulted"   => true,
+                                                 "backtrace" => [{"type"    => "address",
+                                                                  "address" => 5}]}])).
+          to be_symbolicated
     end
 
     it "should send an email if the notification threshold has been tripped" do
       if RSpec.configuration.use_transactional_fixtures
-        pending "This is done in an after_commit hook, and it can't be tested with transactional fixtures (which are always rolled back)"
+        skip "This is done in an after_commit hook, and it can't be tested with transactional fixtures (which are always rolled back)"
       end
 
       occurrence = FactoryGirl.create(:rails_occurrence)
@@ -76,26 +76,26 @@
       ActionMailer::Base.deliveries.clear
 
       FactoryGirl.create :rails_occurrence, bug: occurrence.bug
-      ActionMailer::Base.deliveries.should be_empty
+      expect(ActionMailer::Base.deliveries).to be_empty
 
       FactoryGirl.create :rails_occurrence, bug: occurrence.bug
-      ActionMailer::Base.deliveries.size.should eql(1)
-      ActionMailer::Base.deliveries.first.to.should eql([nt.user.email])
+      expect(ActionMailer::Base.deliveries.size).to eql(1)
+      expect(ActionMailer::Base.deliveries.first.to).to eql([nt.user.email])
     end
 
     it "should update last_tripped_at" do
       if RSpec.configuration.use_transactional_fixtures
-        pending "This is done in an after_commit hook, and it can't be tested with transactional fixtures (which are always rolled back)"
+        skip "This is done in an after_commit hook, and it can't be tested with transactional fixtures (which are always rolled back)"
       end
 
       occurrence = FactoryGirl.create(:rails_occurrence)
       nt         = FactoryGirl.create(:notification_threshold, bug: occurrence.bug, period: 1.minute, threshold: 3)
 
       FactoryGirl.create :rails_occurrence, bug: occurrence.bug
-      nt.reload.last_tripped_at.should be_nil
+      expect(nt.reload.last_tripped_at).to be_nil
 
       FactoryGirl.create :rails_occurrence, bug: occurrence.bug
-      nt.reload.last_tripped_at.should be_within(1).of(Time.now)
+      expect(nt.reload.last_tripped_at).to be_within(1).of(Time.now)
     end
 
     context "[PagerDuty integration]" do
@@ -104,69 +104,134 @@
                              Squash::Configuration.pagerduty.api_url,
                              response: File.read(Rails.root.join('spec', 'fixtures', 'pagerduty_response.json'))
 
-        @project = FactoryGirl.create(:project, pagerduty_service_key: 'abc123', critical_threshold: 2, pagerduty_enabled: true)
+        @project     = FactoryGirl.create(:project, pagerduty_service_key: 'abc123', critical_threshold: 2, pagerduty_enabled: true)
         @environment = FactoryGirl.create(:environment, project: @project, notifies_pagerduty: true)
-        @bug = FactoryGirl.create(:bug, environment: @environment)
+        @bug         = FactoryGirl.create(:bug, environment: @environment)
       end
 
-      it "should not send an incident to PagerDuty until the critical threshold is breached" do
-        PagerDutyNotifier.any_instance.should_not_receive :trigger
-        FactoryGirl.create_list :rails_occurrence, 2, bug: @bug
+      context "[critical threshold notification]" do
+        it "should not send an incident to PagerDuty until the critical threshold is breached" do
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 2, bug: @bug
+        end
+
+        it "should send an incident if always_notify_pagerduty is set" do
+          @project.update_attribute :always_notify_pagerduty, true
+          expect_any_instance_of(Service::PagerDuty).to receive(:trigger).once.with(
+              /#{Regexp.escape @bug.class_name} in #{Regexp.escape File.basename(@bug.file)}:#{@bug.line}/,
+              @bug.pagerduty_incident_key,
+              an_instance_of(Hash)
+          )
+          FactoryGirl.create :rails_occurrence, bug: @bug
+        end
+
+        it "should send an incident to PagerDuty once the critical threshold is breached" do
+          FactoryGirl.create_list :rails_occurrence, 2, bug: @bug
+          expect_any_instance_of(Service::PagerDuty).to receive(:trigger).once.with(
+              /#{Regexp.escape @bug.class_name} in #{Regexp.escape File.basename(@bug.file)}:#{@bug.line}/,
+              @bug.pagerduty_incident_key,
+              an_instance_of(Hash)
+          )
+          FactoryGirl.create :rails_occurrence, bug: @bug
+        end
+
+        it "should not send an incident if the project does not have a session key configured" do
+          @project.update_attribute :pagerduty_service_key, nil
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident if incident reporting is disabled" do
+          @project.update_attribute :pagerduty_enabled, false
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident if the environment has incident reporting disabled" do
+          @environment.update_attribute :notifies_pagerduty, nil
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident if the bug is assigned" do
+          @bug.update_attribute :assigned_user, FactoryGirl.create(:membership, project: @project).user
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident if the bug is irrelevant" do
+          @bug.update_attribute :irrelevant, true
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
       end
 
-      it "should send an incident if always_notify_pagerduty is set" do
-        @project.update_attribute :always_notify_pagerduty, true
-        Service::PagerDuty.any_instance.should_receive(:trigger).once.with(
-            /#{Regexp.escape @bug.class_name} in #{Regexp.escape File.basename(@bug.file)}:#{@bug.line}/,
-            @bug.pagerduty_incident_key,
-            an_instance_of(Hash)
-        )
-        FactoryGirl.create :rails_occurrence, bug: @bug
-      end
-
-      it "should send an incident to PagerDuty once the critical threshold is breached" do
-        FactoryGirl.create_list :rails_occurrence, 2, bug: @bug
-        Service::PagerDuty.any_instance.should_receive(:trigger).once.with(
-            /#{Regexp.escape @bug.class_name} in #{Regexp.escape File.basename(@bug.file)}:#{@bug.line}/,
-            @bug.pagerduty_incident_key,
-            an_instance_of(Hash)
-        )
-        FactoryGirl.create :rails_occurrence, bug: @bug
-      end
-
-      it "should not send an incident if the project does not have a session key configured" do
-        @project.update_attribute :pagerduty_service_key, nil
-
-        PagerDutyNotifier.any_instance.should_not_receive :trigger
-        FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
-      end
-
-      it "should not send an incident if incident reporting is disabled" do
-        @project.update_attribute :pagerduty_enabled, false
-
-        PagerDutyNotifier.any_instance.should_not_receive :trigger
-        FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
-      end
-
-      it "should not send an incident if the environment has incident reporting disabled" do
-        @environment.update_attribute :notifies_pagerduty, nil
-
-        PagerDutyNotifier.any_instance.should_not_receive :trigger
-        FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
-      end
-
-      it "should not send an incident if the bug is assigned" do
-        @bug.update_attribute :assigned_user, FactoryGirl.create(:membership, project: @project).user
-
-        PagerDutyNotifier.any_instance.should_not_receive :trigger
-        FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
-      end
-
-      it "should not send an incident if the bug is irrelevant" do
-        @bug.update_attribute :irrelevant, true
-
-        PagerDutyNotifier.any_instance.should_not_receive :trigger
-        FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+      context "[paging threshold notification]" do
+        before :each do
+          @project.update_attribute :critical_threshold, 200
+          @bug.update_attributes page_threshold: 2, page_period: 1.minute
+        end
+
+        it "should send an incident to PagerDuty once if the page threshold is breached" do
+          expect_any_instance_of(Service::PagerDuty).to receive(:trigger).once.with(
+              /#{Regexp.escape @bug.class_name} in #{Regexp.escape File.basename(@bug.file)}:#{@bug.line}/,
+              @bug.pagerduty_incident_key,
+              an_instance_of(Hash)
+          )
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident to PagerDuty if the page threshold is breached again inside the page period" do
+          @bug.update_attributes page_last_tripped_at: 30.seconds.ago
+          expect_any_instance_of(Service::PagerDuty).not_to receive(:trigger)
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should send an incident to PagerDuty if the page threshold is breached again outside the page period" do
+          @bug.update_attributes page_last_tripped_at: 2.minutes.ago
+          expect_any_instance_of(Service::PagerDuty).to receive(:trigger).once
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident if the project does not have a session key configured" do
+          @project.update_attribute :pagerduty_service_key, nil
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident if incident reporting is disabled" do
+          @project.update_attribute :pagerduty_enabled, false
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not send an incident if the environment has incident reporting disabled" do
+          @environment.update_attribute :notifies_pagerduty, nil
+
+          expect_any_instance_of(Service::PagerDuty).not_to receive :trigger
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not an incident if the bug is assigned" do
+          @bug.update_attribute :assigned_user, FactoryGirl.create(:membership, project: @project).user
+
+          expect_any_instance_of(Service::PagerDuty).to receive(:trigger).once
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
+
+        it "should not an incident if the bug is irrelevant" do
+          @bug.update_attribute :irrelevant, true
+
+          expect_any_instance_of(Service::PagerDuty).to receive(:trigger).once
+          FactoryGirl.create_list :rails_occurrence, 3, bug: @bug
+        end
       end
     end unless Squash::Configuration.pagerduty.disabled?
 
@@ -175,14 +240,14 @@
         bug = FactoryGirl.create(:bug)
         expect {
           FactoryGirl.create(:rails_occurrence, bug: bug, crashed: true)
-        }.to change{ bug.reload.any_occurrence_crashed }.from(false).to(true)
+        }.to change { bug.reload.any_occurrence_crashed }.from(false).to(true)
       end
 
       it "should not change any_occurrence_crashed if crashed is false" do
         bug = FactoryGirl.create(:bug)
         expect {
           FactoryGirl.create(:rails_occurrence, bug: bug, crashed: false)
-        }.to_not change{ bug.reload.any_occurrence_crashed }
+        }.to_not change { bug.reload.any_occurrence_crashed }
       end
     end
 
@@ -191,13 +256,13 @@
         bug = FactoryGirl.create(:bug)
 
         occurrence = FactoryGirl.create(:rails_occurrence, bug: bug, device_id: 'hello')
-        occurrence.bug.device_bugs.where(device_id: 'hello').should exist
+        expect(occurrence.bug.device_bugs.where(device_id: 'hello')).to exist
         expect {
           FactoryGirl.create(:rails_occurrence, bug: bug, device_id: 'hello')
-        }.to_not change{ bug.device_bugs.where(device_id: 'hello').count }
+        }.to_not change { bug.device_bugs.where(device_id: 'hello').count }
 
         occurrence = FactoryGirl.create(:rails_occurrence, bug: bug, device_id: 'goodbye')
-        occurrence.bug.device_bugs.where(device_id: 'goodbye').should exist
+        expect(occurrence.bug.device_bugs.where(device_id: 'goodbye')).to exist
       end
     end
   end
@@ -206,17 +271,17 @@
     it "should return the at-fault backtrace" do
       bt1 = [{'file' => 'foo.rb', 'line' => 123, 'symbol' => 'bar'}]
       bt2 = [{'file' => 'bar.rb', 'line' => 321, 'symbol' => 'foo'}]
-      FactoryGirl.build(:occurrence, backtraces: [{'name' => "1", 'faulted' => false, 'backtrace' => bt1},
-                                                  {'name' => '2', 'faulted' => true, 'backtrace' => bt2}]).
-          faulted_backtrace.should eql(bt2)
+      expect(FactoryGirl.build(:occurrence, backtraces: [{'name' => "1", 'faulted' => false, 'backtrace' => bt1},
+                                                         {'name' => '2', 'faulted' => true, 'backtrace' => bt2}]).
+          faulted_backtrace).to eql(bt2)
     end
 
     it "should return an empty array if there is no at-fault backtrace" do
       bt1 = [{'file' => 'foo.rb', 'line' => 123, 'symbol' => 'bar'}]
       bt2 = [{'file' => 'bar.rb', 'line' => 321, 'symbol' => 'foo'}]
-      FactoryGirl.build(:occurrence, backtraces: [{'name' => "1", 'faulted' => false, 'backtrace' => bt1},
-                                                  {'name' => '2', 'faulted' => false, 'backtrace' => bt2}]).
-          faulted_backtrace.should eql([])
+      expect(FactoryGirl.build(:occurrence, backtraces: [{'name' => "1", 'faulted' => false, 'backtrace' => bt1},
+                                                         {'name' => '2', 'faulted' => false, 'backtrace' => bt2}]).
+          faulted_backtrace).to eql([])
     end
   end
 
@@ -226,13 +291,13 @@
       old = o.attributes
 
       o.truncate!
-      o.should be_truncated
+      expect(o).to be_truncated
 
-      o.metadata.should be_nil
-      o.client.should eql(old['client'])
-      o.occurred_at.should eql(old['occurred_at'])
-      o.bug_id.should eql(old['bug_id'])
-      o.number.should eql(old['number'])
+      expect(o.metadata).to be_nil
+      expect(o.client).to eql(old['client'])
+      expect(o.occurred_at).to eql(old['occurred_at'])
+      expect(o.bug_id).to eql(old['bug_id'])
+      expect(o.number).to eql(old['number'])
     end
   end
 
@@ -241,8 +306,8 @@
       os      = FactoryGirl.create_list :rails_occurrence, 4
       another = FactoryGirl.create :rails_occurrence
       Occurrence.truncate! Occurrence.where(id: os.map(&:id))
-      os.map(&:reload).all?(&:truncated?).should be_true
-      another.reload.should_not be_truncated
+      expect(os.map(&:reload).all?(&:truncated?)).to eql(true)
+      expect(another.reload).not_to be_truncated
     end
   end
 
@@ -251,9 +316,9 @@
       o1 = FactoryGirl.create(:rails_occurrence)
       o2 = FactoryGirl.create(:rails_occurrence, bug: o1.bug)
       o1.redirect_to! o2
-      o1.redirect_target.should eql(o2)
-      o1.should be_truncated
-      o1.bug.should_not be_irrelevant
+      expect(o1.redirect_target).to eql(o2)
+      expect(o1).to be_truncated
+      expect(o1.bug).not_to be_irrelevant
     end
 
     it "should mark the bug as irrelevant if it's the last occurrence to be redirected" do
@@ -263,8 +328,8 @@
       o2 = FactoryGirl.create(:rails_occurrence, bug: b2)
 
       o1.redirect_to! o2
-      o1.redirect_target.should eql(o2)
-      b1.reload.should be_irrelevant
+      expect(o1.redirect_target).to eql(o2)
+      expect(b1.reload).to be_irrelevant
     end
   end
 
@@ -272,18 +337,18 @@
     before(:each) do
       @occurrence = FactoryGirl.create(:rails_occurrence)
       # there's a uniqueness constraint on repo URLs, but we need a real repo with real commits
-      @occurrence.bug.environment.project.instance_variable_set :@repo, Project.new { |pp| pp.repository_url = 'git://github.com/RISCfuture/better_caller.git' }.repo
+      @occurrence.bug.environment.project.instance_variable_set :@repo, Project.new { |pp| pp.repository_url = 'https://github.com/RISCfuture/better_caller.git' }.repo
       @occurrence.bug.update_attribute :deploy, FactoryGirl.create(:deploy, environment: @occurrence.bug.environment)
     end
 
     it "should do nothing if there is no symbolication" do
       @occurrence.symbolication_id = nil
-      -> { @occurrence.symbolicate! }.should_not change(@occurrence, :backtraces)
+      expect { @occurrence.symbolicate! }.not_to change(@occurrence, :backtraces)
     end
 
     it "should do nothing if the occurrence is truncated" do
       @occurrence.truncate!
-      -> { @occurrence.symbolicate! }.should_not change(@occurrence, :metadata)
+      expect { @occurrence.symbolicate! }.not_to change(@occurrence, :metadata)
     end
 
     it "should do nothing if the occurrence is already symbolicated" do
@@ -322,7 +387,7 @@
                                                  {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
                                                   "line"   => 644,
                                                   "symbol" => "initialize"}]}]
-      -> { @occurrence.symbolicate! }.should_not change(@occurrence, :backtraces)
+      expect { @occurrence.symbolicate! }.not_to change(@occurrence, :backtraces)
     end
 
     it "should symbolicate the occurrence" do
@@ -345,21 +410,21 @@
                                                      "symbol" => "timeout"}]}]
       @occurrence.symbolicate!
 
-      @occurrence.changes.should be_empty
-      @occurrence.backtraces.should eql([{"name"      => "Thread 0",
-                                          "faulted"   => true,
-                                          "backtrace" => [{"file"   => "foo.rb",
-                                                           "line"   => 15,
-                                                           "symbol" => "bar"},
-                                                          {"file"   => "foo.rb",
-                                                           "line"   => 15,
-                                                           "symbol" => "bar"},
-                                                          {"file"   => "foo2.rb",
-                                                           "line"   => 5,
-                                                           "symbol" => "bar2"},
-                                                          {"file"   => "_RETURN_ADDRESS_",
-                                                           "line"   => 10,
-                                                           "symbol" => "timeout"}]}])
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" => [{"file"   => "foo.rb",
+                                                               "line"   => 15,
+                                                               "symbol" => "bar"},
+                                                              {"file"   => "foo.rb",
+                                                               "line"   => 15,
+                                                               "symbol" => "bar"},
+                                                              {"file"   => "foo2.rb",
+                                                               "line"   => 5,
+                                                               "symbol" => "bar2"},
+                                                              {"file"   => "_RETURN_ADDRESS_",
+                                                               "line"   => 10,
+                                                               "symbol" => "timeout"}]}])
     end
 
 
@@ -388,98 +453,98 @@
                                                      "symbol" => "timeout"}]}]
       @occurrence.symbolicate! symb2
 
-      @occurrence.changes.should be_empty
-      @occurrence.backtraces.should eql([{"name"      => "Thread 0",
-                                          "faulted"   => true,
-                                          "backtrace" => [{"file"   => "foo3.rb",
-                                                           "line"   => 15,
-                                                           "symbol" => "bar3"},
-                                                          {"file"   => "foo3.rb",
-                                                           "line"   => 15,
-                                                           "symbol" => "bar3"},
-                                                          {"file"   => "foo4.rb",
-                                                           "line"   => 5,
-                                                           "symbol" => "bar4"},
-                                                          {"file"   => "_RETURN_ADDRESS_",
-                                                           "line"   => 10,
-                                                           "symbol" => "timeout"}]}])
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" => [{"file"   => "foo3.rb",
+                                                               "line"   => 15,
+                                                               "symbol" => "bar3"},
+                                                              {"file"   => "foo3.rb",
+                                                               "line"   => 15,
+                                                               "symbol" => "bar3"},
+                                                              {"file"   => "foo4.rb",
+                                                               "line"   => 5,
+                                                               "symbol" => "bar4"},
+                                                              {"file"   => "_RETURN_ADDRESS_",
+                                                               "line"   => 10,
+                                                               "symbol" => "timeout"}]}])
     end
   end
 
   describe "#symbolicated?" do
     it "should return true if all lines are symbolicated" do
-      FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
-                                                   "faulted"   => true,
-                                                   "backtrace" => [{"file"   => "/usr/bin/gist",
-                                                                    "line"   => 313,
-                                                                    "symbol" => "<main>"},
-                                                                   {"file"   => "/usr/bin/gist",
-                                                                    "line"   => 171,
-                                                                    "symbol" => "execute"},
-                                                                   {"file"   => "/usr/bin/gist",
-                                                                    "line"   => 197,
-                                                                    "symbol" => "write"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 626,
-                                                                    "symbol" => "start"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 637,
-                                                                    "symbol" => "do_start"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "connect"},
-                                                                   {"file"   => "_RETURN_ADDRESS_",
-                                                                    "line"   => 87,
-                                                                    "symbol" => "timeout"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                                    "line"   => 44,
-                                                                    "symbol" => "timeout"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "block in connect"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "open"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "initialize"}]}]).should be_symbolicated
+      expect(FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
+                                                          "faulted"   => true,
+                                                          "backtrace" => [{"file"   => "/usr/bin/gist",
+                                                                           "line"   => 313,
+                                                                           "symbol" => "<main>"},
+                                                                          {"file"   => "/usr/bin/gist",
+                                                                           "line"   => 171,
+                                                                           "symbol" => "execute"},
+                                                                          {"file"   => "/usr/bin/gist",
+                                                                           "line"   => 197,
+                                                                           "symbol" => "write"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 626,
+                                                                           "symbol" => "start"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 637,
+                                                                           "symbol" => "do_start"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "connect"},
+                                                                          {"file"   => "_RETURN_ADDRESS_",
+                                                                           "line"   => 87,
+                                                                           "symbol" => "timeout"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                           "line"   => 44,
+                                                                           "symbol" => "timeout"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "block in connect"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "open"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "initialize"}]}])).to be_symbolicated
     end
 
     it "should return false if any line is unsymbolicated" do
-      FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
-                                                   "faulted"   => true,
-                                                   "backtrace" => [{"file"   => "/usr/bin/gist",
-                                                                    "line"   => 313,
-                                                                    "symbol" => "<main>"},
-                                                                   {"file"   => "/usr/bin/gist",
-                                                                    "line"   => 171,
-                                                                    "symbol" => "execute"},
-                                                                   {"file"   => "/usr/bin/gist",
-                                                                    "line"   => 197,
-                                                                    "symbol" => "write"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 626,
-                                                                    "symbol" => "start"},
-                                                                   {"type"    => "address",
-                                                                    "address" => 4632},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "connect"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                                    "line"   => 87,
-                                                                    "symbol" => "timeout"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                                    "line"   => 44,
-                                                                    "symbol" => "timeout"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "block in connect"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "open"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "initialize"}]}]).should_not be_symbolicated
+      expect(FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
+                                                          "faulted"   => true,
+                                                          "backtrace" => [{"file"   => "/usr/bin/gist",
+                                                                           "line"   => 313,
+                                                                           "symbol" => "<main>"},
+                                                                          {"file"   => "/usr/bin/gist",
+                                                                           "line"   => 171,
+                                                                           "symbol" => "execute"},
+                                                                          {"file"   => "/usr/bin/gist",
+                                                                           "line"   => 197,
+                                                                           "symbol" => "write"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 626,
+                                                                           "symbol" => "start"},
+                                                                          {"type"    => "address",
+                                                                           "address" => 4632},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "connect"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                           "line"   => 87,
+                                                                           "symbol" => "timeout"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                           "line"   => 44,
+                                                                           "symbol" => "timeout"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "block in connect"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "open"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "initialize"}]}])).not_to be_symbolicated
     end
   end
 
@@ -487,17 +552,17 @@
     before(:each) do
       @occurrence = FactoryGirl.create(:rails_occurrence)
       # there's a uniqueness constraint on repo URLs, but we need a real repo with real commits
-      @occurrence.bug.environment.project.instance_variable_set :@repo, Project.new { |pp| pp.repository_url = 'git://github.com/RISCfuture/better_caller.git' }.repo
+      @occurrence.bug.environment.project.instance_variable_set :@repo, Project.new { |pp| pp.repository_url = 'https://github.com/RISCfuture/better_caller.git' }.repo
       @occurrence.bug.update_attribute :deploy, FactoryGirl.create(:deploy, environment: @occurrence.bug.environment)
     end
 
     it "should do nothing if there is no source map" do
-      -> { @occurrence.sourcemap! }.should_not change(@occurrence, :backtraces)
+      expect { @occurrence.sourcemap! }.not_to change(@occurrence, :backtraces)
     end
 
     it "should do nothing if the occurrence is truncated" do
       @occurrence.truncate!
-      -> { @occurrence.sourcemap! }.should_not change(@occurrence, :metadata)
+      expect { @occurrence.sourcemap! }.not_to change(@occurrence, :metadata)
     end
 
     it "should do nothing if the occurrence is already sourcemapped" do
@@ -536,17 +601,18 @@
                                                  {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
                                                   "line"   => 644,
                                                   "symbol" => "initialize"}]}]
-      -> { @occurrence.sourcemap! }.should_not change(@occurrence, :backtraces)
+      expect { @occurrence.sourcemap! }.not_to change(@occurrence, :backtraces)
     end
 
     it "should sourcemap the occurrence" do
-      map = Squash::Javascript::SourceMap.new
-      map << Squash::Javascript::SourceMap::Mapping.new('http://test.host/example/asset.js', 3, 140, 'app/assets/javascripts/source.js', 25, 1, 'foobar')
+      map = GemSourceMap::Map.new([
+                                      GemSourceMap::Mapping.new('app/assets/javascripts/source.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(25, 1)),
+                                  ], 'http://test.host/example/asset.js')
       FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: @occurrence.revision, map: map
 
       @occurrence.backtraces = [{"name"      => "Thread 0",
                                  "faulted"   => true,
-                                 "backtrace" => [{"type"    => "minified",
+                                 "backtrace" => [{"type"    => "js:hosted",
                                                   "url"     => "http://test.host/example/asset.js",
                                                   "line"    => 3,
                                                   "column"  => 140,
@@ -554,27 +620,122 @@
                                                   "context" => nil}]}]
       @occurrence.sourcemap!
 
-      @occurrence.changes.should be_empty
-      @occurrence.backtraces.should eql([{"name"      => "Thread 0",
-                                          "faulted"   => true,
-                                          "backtrace" => [{"file"   => "app/assets/javascripts/source.js",
-                                                           "line"   => 25,
-                                                           "symbol" => "foobar"}]}])
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" => [{"file"   => "app/assets/javascripts/source.js",
+                                                               "line"   => 25,
+                                                               "column" => 1}]}])
     end
 
+    it "should apply multiple source maps" do
+      map1 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(25, 1)),
+                                   ], 'http://test.host/example/asset.js')
+      map2 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source.js.coffee', GemSourceMap::Offset.new(25, 1), GemSourceMap::Offset.new(11, 1)),
+                                   ], 'app/assets/javascripts/source.js')
+
+      FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: @occurrence.revision, map: map1, from: 'hosted', to: 'compiled'
+      FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: @occurrence.revision, map: map2, from: 'compiled', to: 'coffee'
+
+      @occurrence.backtraces = [{"name"      => "Thread 0",
+                                 "faulted"   => true,
+                                 "backtrace" => [{"type"    => "js:hosted",
+                                                  "url"     => "http://test.host/example/asset.js",
+                                                  "line"    => 3,
+                                                  "column"  => 140,
+                                                  "symbol"  => "foo",
+                                                  "context" => nil}]}]
+      @occurrence.sourcemap!
+
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" => [{"file"   => "app/assets/javascripts/source.js.coffee",
+                                                               "line"   => 11,
+                                                               "column" => 1}]}])
+    end
+
+    it "should search for sourcemaps in previous revisions if digest_in_asset_names is true" do
+      @occurrence.bug.environment.project.update_attribute :digest_in_asset_names, true
+
+      map1 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(25, 1)),
+                                   ], 'http://test.host/example/asset.js')
+      map2 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source.js.coffee', GemSourceMap::Offset.new(25, 1), GemSourceMap::Offset.new(11, 1)),
+                                   ], 'app/assets/javascripts/source.js')
+
+      FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: 'e80f7f4a578a869f54b8ff675220e9d3071ea513', map: map1, from: 'hosted', to: 'compiled'
+      FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: @occurrence.revision, map: map2, from: 'compiled', to: 'coffee'
+
+      @occurrence.backtraces = [{"name"      => "Thread 0",
+                                 "faulted"   => true,
+                                 "backtrace" => [{"type"    => "js:hosted",
+                                                  "url"     => "http://test.host/example/asset.js",
+                                                  "line"    => 3,
+                                                  "column"  => 140,
+                                                  "symbol"  => "foo",
+                                                  "context" => nil}]}]
+      @occurrence.sourcemap!
+
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" => [{"file"   => "app/assets/javascripts/source.js.coffee",
+                                                               "line"   => 11,
+                                                               "column" => 1}]}])
+    end
+
+    it "should not search for sourcemaps in previous revisions if digest_in_asset_names is false" do
+      @occurrence.bug.environment.project.update_attribute :digest_in_asset_names, false
+
+      map1 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(25, 1)),
+                                   ], 'http://test.host/example/asset.js')
+      map2 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source.js.coffee', GemSourceMap::Offset.new(25, 1), GemSourceMap::Offset.new(11, 1)),
+                                   ], 'app/assets/javascripts/source.js')
+
+      FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: 'e80f7f4a578a869f54b8ff675220e9d3071ea513', map: map1, from: 'hosted', to: 'compiled'
+      FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: @occurrence.revision, map: map2, from: 'compiled', to: 'coffee'
+
+      @occurrence.backtraces = [{"name"      => "Thread 0",
+                                 "faulted"   => true,
+                                 "backtrace" => [{"type"    => "js:hosted",
+                                                  "url"     => "http://test.host/example/asset.js",
+                                                  "line"    => 3,
+                                                  "column"  => 140,
+                                                  "symbol"  => "foo",
+                                                  "context" => nil}]}]
+      @occurrence.sourcemap!
+
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" => [{"type"    => "js:hosted",
+                                                               "url"     => "http://test.host/example/asset.js",
+                                                               "line"    => 3,
+                                                               "column"  => 140,
+                                                               "symbol"  => "foo",
+                                                               "context" => nil}]}])
+    end
 
     it "should use a custom sourcemap" do
-      map1 = Squash::Javascript::SourceMap.new
-      map1 << Squash::Javascript::SourceMap::Mapping.new('http://test.host/example/asset.js', 3, 140, 'app/assets/javascripts/source1.js', 1, 1, 'foobar1')
-      map2 = Squash::Javascript::SourceMap.new
-      map2 << Squash::Javascript::SourceMap::Mapping.new('http://test.host/example/asset.js', 3, 140, 'app/assets/javascripts/source2.js', 2, 2, 'foobar2')
+      map1 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source1.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(1, 1)),
+                                   ], 'http://test.host/example/asset.js')
+      map2 = GemSourceMap::Map.new([
+                                       GemSourceMap::Mapping.new('app/assets/javascripts/source2.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(2, 2)),
+                                   ], 'http://test.host/example/asset.js')
 
       sm1 = FactoryGirl.create :source_map, environment: @occurrence.bug.environment, revision: @occurrence.revision, map: map1
       sm2 = FactoryGirl.create :source_map, map: map2
 
       @occurrence.backtraces = [{"name"      => "Thread 0",
                                  "faulted"   => true,
-                                 "backtrace" => [{"type"    => "minified",
+                                 "backtrace" => [{"type"    => "js:hosted",
                                                   "url"     => "http://test.host/example/asset.js",
                                                   "line"    => 3,
                                                   "column"  => 140,
@@ -582,86 +743,86 @@
                                                   "context" => nil}]}]
       @occurrence.sourcemap! sm2
 
-      @occurrence.changes.should be_empty
-      @occurrence.backtraces.should eql([{"name"      => "Thread 0",
-                                          "faulted"   => true,
-                                          "backtrace" => [{"file"   => "app/assets/javascripts/source2.js",
-                                                           "line"   => 2,
-                                                           "symbol" => "foobar2"}]}])
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" => [{"file"   => "app/assets/javascripts/source2.js",
+                                                               "line"   => 2,
+                                                               "column" => 2}]}])
     end
   end
 
   describe "#sourcemapped?" do
     it "should return true if all lines are source-mapped" do
-      FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
-                                                   "faulted"   => true,
-                                                   "backtrace" => [{"file"   => "/usr/bin/gist",
-                                                                    "line"   => 313,
-                                                                    "symbol" => "<main>"},
-                                                                   {"file"   => "/usr/bin/gist",
-                                                                    "line"   => 171,
-                                                                    "symbol" => "execute"},
-                                                                   {"file"   => "/usr/bin/gist",
-                                                                    "line"   => 197,
-                                                                    "symbol" => "write"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 626,
-                                                                    "symbol" => "start"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 637,
-                                                                    "symbol" => "do_start"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "connect"},
-                                                                   {"file"   => "_RETURN_ADDRESS_",
-                                                                    "line"   => 87,
-                                                                    "symbol" => "timeout"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                                    "line"   => 44,
-                                                                    "symbol" => "timeout"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "block in connect"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "open"},
-                                                                   {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                                    "line"   => 644,
-                                                                    "symbol" => "initialize"}]}]).should be_sourcemapped
+      expect(FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
+                                                          "faulted"   => true,
+                                                          "backtrace" => [{"file"   => "/usr/bin/gist",
+                                                                           "line"   => 313,
+                                                                           "symbol" => "<main>"},
+                                                                          {"file"   => "/usr/bin/gist",
+                                                                           "line"   => 171,
+                                                                           "symbol" => "execute"},
+                                                                          {"file"   => "/usr/bin/gist",
+                                                                           "line"   => 197,
+                                                                           "symbol" => "write"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 626,
+                                                                           "symbol" => "start"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 637,
+                                                                           "symbol" => "do_start"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "connect"},
+                                                                          {"file"   => "_RETURN_ADDRESS_",
+                                                                           "line"   => 87,
+                                                                           "symbol" => "timeout"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                           "line"   => 44,
+                                                                           "symbol" => "timeout"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "block in connect"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "open"},
+                                                                          {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                           "line"   => 644,
+                                                                           "symbol" => "initialize"}]}])).to be_sourcemapped
     end
 
     it "should return false if any line is not source-mapped" do
-      FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
-                                                   "faulted"   => true,
-                                                   "backtrace" =>
-                                                       [{"file" => "/usr/bin/gist", "line" => 313, "symbol" => "<main>"},
-                                                        {"file" => "/usr/bin/gist", "line" => 171, "symbol" => "execute"},
-                                                        {"file" => "/usr/bin/gist", "line" => 197, "symbol" => "write"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 626,
-                                                         "symbol" => "start"},
-                                                        {"type"    => "minified",
-                                                         "url"     => "http://test.host/my.js",
-                                                         "line"    => 20,
-                                                         "column"  => 5,
-                                                         "symbol"  => "myfunction",
-                                                         "context" => nil},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "connect"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                         "line"   => 87,
-                                                         "symbol" => "timeout"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                         "line"   => 44,
-                                                         "symbol" => "timeout"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "block in connect"},
-                                                        {"file" => "/usr/lib/ruby/1.9.1/net/http.rb", "line" => 644, "symbol" => "open"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "initialize"}]}]).should_not be_sourcemapped
+      expect(FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
+                                                          "faulted"   => true,
+                                                          "backtrace" =>
+                                                              [{"file" => "/usr/bin/gist", "line" => 313, "symbol" => "<main>"},
+                                                               {"file" => "/usr/bin/gist", "line" => 171, "symbol" => "execute"},
+                                                               {"file" => "/usr/bin/gist", "line" => 197, "symbol" => "write"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 626,
+                                                                "symbol" => "start"},
+                                                               {"type"    => "js:hosted",
+                                                                "url"     => "http://test.host/my.js",
+                                                                "line"    => 20,
+                                                                "column"  => 5,
+                                                                "symbol"  => "myfunction",
+                                                                "context" => nil},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "connect"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                "line"   => 87,
+                                                                "symbol" => "timeout"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                "line"   => 44,
+                                                                "symbol" => "timeout"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "block in connect"},
+                                                               {"file" => "/usr/lib/ruby/1.9.1/net/http.rb", "line" => 644, "symbol" => "open"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "initialize"}]}])).not_to be_sourcemapped
     end
   end
 
@@ -669,17 +830,17 @@
     before(:each) do
       @occurrence = FactoryGirl.create(:rails_occurrence)
       # there's a uniqueness constraint on repo URLs, but we need a real repo with real commits
-      @occurrence.bug.environment.project.instance_variable_set :@repo, Project.new { |pp| pp.repository_url = 'git://github.com/RISCfuture/better_caller.git' }.repo
+      @occurrence.bug.environment.project.instance_variable_set :@repo, Project.new { |pp| pp.repository_url = 'https://github.com/RISCfuture/better_caller.git' }.repo
       @occurrence.bug.update_attribute :deploy, FactoryGirl.create(:deploy, environment: @occurrence.bug.environment)
     end
 
     it "should do nothing if there is no obfuscation map" do
-      -> { @occurrence.deobfuscate! }.should_not change(@occurrence, :backtraces)
+      expect { @occurrence.deobfuscate! }.not_to change(@occurrence, :backtraces)
     end
 
     it "should do nothing if the occurrence is truncated" do
       @occurrence.truncate!
-      -> { @occurrence.deobfuscate! }.should_not change(@occurrence, :metadata)
+      expect { @occurrence.deobfuscate! }.not_to change(@occurrence, :metadata)
     end
 
     it "should do nothing if the occurrence is already de-obfuscated" do
@@ -709,7 +870,7 @@
                                       {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
                                        "line"   => 644,
                                        "symbol" => "initialize"}]}]
-      -> { @occurrence.deobfuscate! }.should_not change(@occurrence, :backtraces)
+      expect { @occurrence.deobfuscate! }.not_to change(@occurrence, :backtraces)
     end
 
     it "should deobfuscate the occurrence" do
@@ -722,20 +883,20 @@
       @occurrence.backtraces = [{"name"      => "Thread 0",
                                  "faulted"   => true,
                                  "backtrace" =>
-                                     [{"type"   => "obfuscated",
-                                       "file"   => "B.java",
-                                       "line"   => 15,
-                                       "symbol" => "int a(java.lang.String)",
-                                       "class_name"  => "com.A.B"}]}]
+                                     [{"type"       => "obfuscated",
+                                       "file"       => "B.java",
+                                       "line"       => 15,
+                                       "symbol"     => "int a(java.lang.String)",
+                                       "class_name" => "com.A.B"}]}]
       @occurrence.deobfuscate!
 
-      @occurrence.changes.should be_empty
-      @occurrence.backtraces.should eql([{"name"      => "Thread 0",
-                                          "faulted"   => true,
-                                          "backtrace" =>
-                                              [{"file"   => "src/foo/Bar.java",
-                                                "line"   => 15,
-                                                "symbol" => "int baz(java.lang.String)"}]}])
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" =>
+                                                  [{"file"   => "src/foo/Bar.java",
+                                                    "line"   => 15,
+                                                    "symbol" => "int baz(java.lang.String)"}]}])
     end
 
     it "should leave un-obfuscated names intact" do
@@ -748,30 +909,30 @@
       @occurrence.backtraces = [{"name"      => "Thread 0",
                                  "faulted"   => true,
                                  "backtrace" =>
-                                     [{"type"   => "obfuscated",
-                                       "file"   => "B.java",
-                                       "line"   => 15,
-                                       "symbol" => "int b(java.lang.String)",
-                                       "class_name"  => "com.A.B"},
-                                      {"type"   => "obfuscated",
-                                       "file"   => "ActivityThread.java",
-                                       "line"   => 15,
-                                       "symbol" => "int a(java.lang.String)",
-                                       "class_name"  => "com.squareup.ActivityThread"}]}]
+                                     [{"type"       => "obfuscated",
+                                       "file"       => "B.java",
+                                       "line"       => 15,
+                                       "symbol"     => "int b(java.lang.String)",
+                                       "class_name" => "com.A.B"},
+                                      {"type"       => "obfuscated",
+                                       "file"       => "ActivityThread.java",
+                                       "line"       => 15,
+                                       "symbol"     => "int a(java.lang.String)",
+                                       "class_name" => "com.squareup.ActivityThread"}]}]
       @occurrence.deobfuscate!
 
-      @occurrence.changes.should be_empty
-      @occurrence.backtraces.should eql([{"name"      => "Thread 0",
-                                          "faulted"   => true,
-                                          "backtrace" =>
-                                              [{"file"   => "src/foo/Bar.java",
-                                                "line"   => 15,
-                                                "symbol" => "int b(java.lang.String)"},
-                                               {"type"   => "obfuscated",
-                                                "file"   => "ActivityThread.java",
-                                                "line"   => 15,
-                                                "symbol" => "int a(java.lang.String)",
-                                                "class_name"  => "com.squareup.ActivityThread"}]}])
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" =>
+                                                  [{"file"   => "src/foo/Bar.java",
+                                                    "line"   => 15,
+                                                    "symbol" => "int b(java.lang.String)"},
+                                                   {"type"       => "obfuscated",
+                                                    "file"       => "ActivityThread.java",
+                                                    "line"       => 15,
+                                                    "symbol"     => "int a(java.lang.String)",
+                                                    "class_name" => "com.squareup.ActivityThread"}]}])
     end
 
     it "should use a custom obfuscation map" do
@@ -791,86 +952,86 @@
       @occurrence.backtraces = [{"name"      => "Thread 0",
                                  "faulted"   => true,
                                  "backtrace" =>
-                                     [{"type"   => "obfuscated",
-                                       "file"   => "B.java",
-                                       "line"   => 15,
-                                       "symbol" => "int a(java.lang.String)",
-                                       "class_name"  => "com.A.B"}]}]
+                                     [{"type"       => "obfuscated",
+                                       "file"       => "B.java",
+                                       "line"       => 15,
+                                       "symbol"     => "int a(java.lang.String)",
+                                       "class_name" => "com.A.B"}]}]
       @occurrence.deobfuscate! om2
 
-      @occurrence.changes.should be_empty
-      @occurrence.backtraces.should eql([{"name"      => "Thread 0",
-                                          "faulted"   => true,
-                                          "backtrace" =>
-                                              [{"file"   => "src/foo/BarTwo.java",
-                                                "line"   => 15,
-                                                "symbol" => "int baz2(java.lang.String)"}]}])
+      expect(@occurrence.changes).to be_empty
+      expect(@occurrence.backtraces).to eql([{"name"      => "Thread 0",
+                                              "faulted"   => true,
+                                              "backtrace" =>
+                                                  [{"file"   => "src/foo/BarTwo.java",
+                                                    "line"   => 15,
+                                                    "symbol" => "int baz2(java.lang.String)"}]}])
     end
   end
 
   describe "#deobfuscated?" do
     it "should return true if all lines are deobfuscated" do
-      FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
-                                                   "faulted"   => true,
-                                                   "backtrace" =>
-                                                       [{"file" => "/usr/bin/gist", "line" => 313, "symbol" => "<main>"},
-                                                        {"file" => "/usr/bin/gist", "line" => 171, "symbol" => "execute"},
-                                                        {"file" => "/usr/bin/gist", "line" => 197, "symbol" => "write"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 626,
-                                                         "symbol" => "start"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 637,
-                                                         "symbol" => "do_start"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "connect"},
-                                                        {"file" => "_JAVA_", "line" => 87, "symbol" => "timeout"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                         "line"   => 44,
-                                                         "symbol" => "timeout"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "block in connect"},
-                                                        {"file" => "/usr/lib/ruby/1.9.1/net/http.rb", "line" => 644, "symbol" => "open"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "initialize"}]}]).
-          should be_deobfuscated
+      expect(FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
+                                                          "faulted"   => true,
+                                                          "backtrace" =>
+                                                              [{"file" => "/usr/bin/gist", "line" => 313, "symbol" => "<main>"},
+                                                               {"file" => "/usr/bin/gist", "line" => 171, "symbol" => "execute"},
+                                                               {"file" => "/usr/bin/gist", "line" => 197, "symbol" => "write"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 626,
+                                                                "symbol" => "start"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 637,
+                                                                "symbol" => "do_start"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "connect"},
+                                                               {"file" => "_JAVA_", "line" => 87, "symbol" => "timeout"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                "line"   => 44,
+                                                                "symbol" => "timeout"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "block in connect"},
+                                                               {"file" => "/usr/lib/ruby/1.9.1/net/http.rb", "line" => 644, "symbol" => "open"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "initialize"}]}])).
+          to be_deobfuscated
     end
 
     it "should return false if any line is deobfuscated" do
-      FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
-                                                   "faulted"   => true,
-                                                   "backtrace" =>
-                                                       [{"file" => "/usr/bin/gist", "line" => 313, "symbol" => "<main>"},
-                                                        {"file" => "/usr/bin/gist", "line" => 171, "symbol" => "execute"},
-                                                        {"file" => "/usr/bin/gist", "line" => 197, "symbol" => "write"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 626,
-                                                         "symbol" => "start"},
-                                                        {"type"   => "obfuscated",
-                                                         "file"   => "A.java",
-                                                         "line"   => 15,
-                                                         "symbol" => "b",
-                                                         "class_name"  => "A"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "connect"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                         "line"   => 87,
-                                                         "symbol" => "timeout"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
-                                                         "line"   => 44,
-                                                         "symbol" => "timeout"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "block in connect"},
-                                                        {"file" => "/usr/lib/ruby/1.9.1/net/http.rb", "line" => 644, "symbol" => "open"},
-                                                        {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
-                                                         "line"   => 644,
-                                                         "symbol" => "initialize"}]}]).
-          should_not be_deobfuscated
+      expect(FactoryGirl.build(:occurrence, backtraces: [{"name"      => "Thread 0",
+                                                          "faulted"   => true,
+                                                          "backtrace" =>
+                                                              [{"file" => "/usr/bin/gist", "line" => 313, "symbol" => "<main>"},
+                                                               {"file" => "/usr/bin/gist", "line" => 171, "symbol" => "execute"},
+                                                               {"file" => "/usr/bin/gist", "line" => 197, "symbol" => "write"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 626,
+                                                                "symbol" => "start"},
+                                                               {"type"       => "obfuscated",
+                                                                "file"       => "A.java",
+                                                                "line"       => 15,
+                                                                "symbol"     => "b",
+                                                                "class_name" => "A"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "connect"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                "line"   => 87,
+                                                                "symbol" => "timeout"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/timeout.rb",
+                                                                "line"   => 44,
+                                                                "symbol" => "timeout"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "block in connect"},
+                                                               {"file" => "/usr/lib/ruby/1.9.1/net/http.rb", "line" => 644, "symbol" => "open"},
+                                                               {"file"   => "/usr/lib/ruby/1.9.1/net/http.rb",
+                                                                "line"   => 644,
+                                                                "symbol" => "initialize"}]}])).
+          not_to be_deobfuscated
     end
   end
 
@@ -880,9 +1041,9 @@
       bug2 = FactoryGirl.create(:bug, environment: bug1.environment)
       occ  = FactoryGirl.create(:rails_occurrence, bug: bug1)
 
-      blamer = Blamer.new(occ)
-      Blamer.stub!(:new).and_return(blamer)
-      blamer.should_receive(:find_or_create_bug!).once.and_return(bug2)
+      blamer = bug1.environment.project.blamer.new(occ)
+      allow(blamer.class).to receive(:new).and_return(blamer)
+      expect(blamer).to receive(:find_or_create_bug!).once.and_return(bug2)
 
       message     = occ.message
       revision    = occ.revision
@@ -890,14 +1051,14 @@
       client      = occ.client
       occ.recategorize!
 
-      bug2.occurrences.count.should eql(1)
+      expect(bug2.occurrences.count).to eql(1)
       occ2 = bug2.occurrences.first
-      occ.redirect_target.should eql(occ2)
+      expect(occ.redirect_target).to eql(occ2)
 
-      occ2.message.should eql(message)
-      occ2.revision.should eql(revision)
-      occ2.occurred_at.should eql(occurred_at)
-      occ2.client.should eql(client)
+      expect(occ2.message).to eql(message)
+      expect(occ2.revision).to eql(revision)
+      expect(occ2.occurred_at).to eql(occurred_at)
+      expect(occ2.client).to eql(client)
     end
 
     it "should reopen the new bug if necessary" do
@@ -905,9 +1066,9 @@
       bug2 = FactoryGirl.create(:bug, environment: bug1.environment, fixed: true, fix_deployed: true)
       occ  = FactoryGirl.create(:rails_occurrence, bug: bug1)
 
-      blamer = Blamer.new(occ)
-      Blamer.stub!(:new).and_return(blamer)
-      blamer.should_receive(:find_or_create_bug!).once.and_return(bug2)
+      blamer = bug1.environment.project.blamer.new(occ)
+      allow(blamer.class).to receive(:new).and_return(blamer)
+      expect(blamer).to receive(:find_or_create_bug!).once.and_return(bug2)
 
       message     = occ.message
       revision    = occ.revision
@@ -915,14 +1076,14 @@
       client      = occ.client
       occ.recategorize!
 
-      bug2.occurrences.count.should eql(1)
+      expect(bug2.occurrences.count).to eql(1)
       occ2 = bug2.occurrences.first
-      occ.redirect_target.should eql(occ2)
+      expect(occ.redirect_target).to eql(occ2)
 
-      occ2.message.should eql(message)
-      occ2.revision.should eql(revision)
-      occ2.occurred_at.should eql(occurred_at)
-      occ2.client.should eql(client)
+      expect(occ2.message).to eql(message)
+      expect(occ2.revision).to eql(revision)
+      expect(occ2.occurred_at).to eql(occurred_at)
+      expect(occ2.client).to eql(client)
     end
   end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index d6f6b220..cd2d31fd 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,16 +12,16 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Project do
+RSpec.describe Project, type: :model do
   describe '#repo' do
     it "should check out the repository and return a Repository object" do
-      Project.where(repository_url: "git://github.com/RISCfuture/better_caller.git").delete_all
-      repo = FactoryGirl.create(:project, repository_url: "git://github.com/RISCfuture/better_caller.git").repo
-      repo.should be_kind_of(Git::Base)
-      repo.index.should be_nil # should be bare
-      repo.repo.path.should eql(Rails.root.join('tmp', 'repos', '55bc7a5f8df17ec2adbf954a4624ea152c3992d9.git').to_s)
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      repo = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git').repo
+      expect(repo).to be_kind_of(Git::Base)
+      expect(repo.index).to be_nil # should be bare
+      expect(repo.repo.path).to eql(Rails.root.join('tmp', 'repos', '624502932dfb6785124fbcc3c03cfb5e20f81d8f.git').to_s)
     end
   end
 
@@ -31,23 +31,23 @@
     end
 
     it "should return :project for a file under app/" do
-      @project.path_type('app/models/foo.rb').should eql(:project)
+      expect(@project.path_type('app/models/foo.rb')).to eql(:project)
     end
 
     it "should return :library for an absolute path" do
-      @project.path_type('/Users/sancho/.rvm/some/path/lib.rb').should eql(:library)
+      expect(@project.path_type('/Users/sancho/.rvm/some/path/lib.rb')).to eql(:library)
     end
 
     it "should return :library for meta-file-name lines" do
-      @project.path_type('(irb)').should eql(:library)
+      expect(@project.path_type('(irb)')).to eql(:library)
     end
 
     it "should return :filtered for a file under vendor/ when vendor/ is in the filter paths" do
-      @project.path_type('vendor/lib.rb').should eql(:filtered)
+      expect(@project.path_type('vendor/lib.rb')).to eql(:filtered)
     end
 
     it "should return :project for a file under vendor/lib when vendor/lib is in the whitelist paths" do
-      @project.path_type('vendor/lib/foobar.rb').should eql(:project)
+      expect(@project.path_type('vendor/lib/foobar.rb')).to eql(:project)
     end
   end
 
@@ -55,8 +55,8 @@
     it "should create a membership for the owner" do
       project    = FactoryGirl.create(:project)
       membership = project.memberships.where(user_id: project.owner_id).first
-      membership.should_not be_nil
-      membership.should be_admin
+      expect(membership).not_to be_nil
+      expect(membership).to be_admin
     end
 
     it "should create a membership for the new owner when the owner is changed" do
@@ -64,8 +64,8 @@
       new_owner = FactoryGirl.create(:user)
       project.update_attribute :owner, new_owner
       membership = project.memberships.where(user_id: new_owner.id).first
-      membership.should_not be_nil
-      membership.should be_admin
+      expect(membership).not_to be_nil
+      expect(membership).to be_admin
     end
 
     it "should promote an existing owner membership to admin" do
@@ -73,8 +73,8 @@
       new_owner = FactoryGirl.create(:membership, project: project).user
       project.update_attribute :owner, new_owner
       membership = project.memberships.where(user_id: new_owner.id).first
-      membership.should_not be_nil
-      membership.should be_admin
+      expect(membership).not_to be_nil
+      expect(membership).to be_admin
     end
 
     it "should not remove the membership from the old owner" do
@@ -82,42 +82,44 @@
       old_owner = project.owner
       project.update_attribute :owner, FactoryGirl.create(:user)
       membership = project.memberships.where(user_id: old_owner.id).first
-      membership.should_not be_nil
-      membership.should be_admin
+      expect(membership).not_to be_nil
+      expect(membership).to be_admin
     end
 
     it "should create a new API key automatically" do
-      FactoryGirl.create(:project, api_key: nil).api_key.should_not be_nil
+      expect(FactoryGirl.create(:project, api_key: nil).api_key).not_to be_nil
     end
 
     it "should automatically set commit_url_format if able" do
-      FactoryGirl.create(:project, repository_url: 'git@github.com:RISCfuture/better_caller.git').commit_url_format.should eql("https://github.com/RISCfuture/better_caller/commit/%{commit}")
-      FactoryGirl.create(:project, repository_url: 'https://RISCfuture@github.com/RISCfuture/better_caller.git').commit_url_format.should eql("https://github.com/RISCfuture/better_caller/commit/%{commit}")
-      Project.where(repository_url: "git://github.com/RISCfuture/better_caller.git").delete_all
-      FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git').commit_url_format.should eql("https://github.com/RISCfuture/better_caller/commit/%{commit}")
+      expect(FactoryGirl.create(:project, repository_url: 'git@github.com:RISCfuture/better_caller.git').commit_url_format).to eql('https://github.com/RISCfuture/better_caller/commit/%{commit}')
+      expect(FactoryGirl.create(:project, repository_url: 'https://RISCfuture@github.com/RISCfuture/better_caller.git').commit_url_format).to eql('https://github.com/RISCfuture/better_caller/commit/%{commit}')
+
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+
+      expect(FactoryGirl.create(:project, repository_url: 'git@github.com:RISCfuture/better_caller.git').commit_url_format).to eql('https://github.com/RISCfuture/better_caller/commit/%{commit}')
     end
 
     it "should not overwrite a custom commit_url_format" do
-      Project.where(repository_url: "git@github.com:RISCfuture/better_caller.git").delete_all
-      FactoryGirl.create(:project, repository_url: 'git@github.com:RISCfuture/better_caller.git', commit_url_format: 'http://example.com/%{commit}').commit_url_format.should eql("http://example.com/%{commit}")
+      Project.where(repository_url: 'https://github.com/RISCfuture/better_caller.git').delete_all
+      expect(FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git', commit_url_format: 'http://example.com/%{commit}').commit_url_format).to eql('http://example.com/%{commit}')
     end
   end
 
   context '[validations]' do
     it "should not allow a default environment outside of the project" do
       project = FactoryGirl.build(:project, default_environment: FactoryGirl.create(:environment))
-      project.should_not be_valid
-      project.errors[:default_environment_id].should eql(['is not an environment in this project'])
+      expect(project).not_to be_valid
+      expect(project.errors[:default_environment_id]).to eql(['is not an environment in this project'])
     end
   end
 
   describe "#commit_url" do
     it "should return the URL to a commit" do
-      FactoryGirl.build(:project, commit_url_format: 'http://example.com/%{commit}').commit_url('abc123').should eql('http://example.com/abc123')
+      expect(FactoryGirl.build(:project, commit_url_format: 'http://example.com/%{commit}').commit_url('abc123')).to eql('http://example.com/abc123')
     end
 
     it "should return nil if commit_url_format is not set" do
-      FactoryGirl.build(:project, commit_url_format: nil).commit_url('abc123').should be_nil
+      expect(FactoryGirl.build(:project, commit_url_format: nil).commit_url('abc123')).to be_nil
     end
   end
 end
diff --git a/spec/models/source_map_spec.rb b/spec/models/source_map_spec.rb
index a6ca18f1..2bd99204 100644
--- a/spec/models/source_map_spec.rb
+++ b/spec/models/source_map_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe SourceMap do
+RSpec.describe SourceMap, type: :model do
   context "[hooks]" do
     it "should source-map pending occurrences when created" do
       if RSpec.configuration.use_transactional_fixtures
@@ -22,8 +22,8 @@
       end
 
       Project.delete_all
-      project = FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git')
-      env = FactoryGirl.create(:environment, project: project)
+      project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
+      env     = FactoryGirl.create(:environment, project: project)
 
       bug        = FactoryGirl.create(:bug,
                                       file:            'lib/better_caller/extensions.rb',
@@ -43,14 +43,15 @@
                                                           "column"  => 144,
                                                           "symbol"  => "eval",
                                                           "context" => nil}]}])
-      occurrence.should_not be_sourcemapped
+      expect(occurrence).not_to be_sourcemapped
 
-      map = Squash::Javascript::SourceMap.new
-      map << Squash::Javascript::SourceMap::Mapping.new('http://test.host/example/asset.js', 3, 140, 'app/assets/javascripts/source.js', 25, 1, 'foobar')
+      map = GemSourceMap::Map.new([
+                                   GemSourceMap::Mapping.new('app/assets/javascripts/source.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(25, 1))
+                               ], 'http://test.host/example/asset.js')
       FactoryGirl.create :source_map, environment: env, revision: '2dc20c984283bede1f45863b8f3b4dd9b5b554cc', map: map
 
-      occurrence.reload.should be_sourcemapped
-      occurrence.redirect_target_id.should be_nil
+      expect(occurrence.reload).to be_sourcemapped
+      expect(occurrence.redirect_target_id).to be_nil
     end
 
     it "should reassign to another bug if blame changes" do
@@ -59,8 +60,8 @@
       end
 
       Project.delete_all
-      project = FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git')
-      env = FactoryGirl.create(:environment, project: project)
+      project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
+      env     = FactoryGirl.create(:environment, project: project)
 
       bug1       = FactoryGirl.create(:bug,
                                       file:            '_JS_ASSET_',
@@ -85,15 +86,47 @@
                                                           "column"  => 144,
                                                           "symbol"  => "eval",
                                                           "context" => nil}]}])
-      occurrence.should_not be_sourcemapped
+      expect(occurrence).not_to be_sourcemapped
 
-      map = Squash::Javascript::SourceMap.new
-      map << Squash::Javascript::SourceMap::Mapping.new('http://test.host/example/asset.js', 3, 140, 'lib/better_caller/extensions.rb', 2, 1, 'foobar')
+      map = GemSourceMap::Map.new([
+                                   GemSourceMap::Mapping.new('app/assets/javascripts/source.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(2, 1))
+                               ], 'http://test.host/example/asset.js')
       FactoryGirl.create :source_map, environment: env, revision: bug1.blamed_revision, map: map
 
-      bug2.occurrences.count.should eql(1)
+      expect(bug2.occurrences.count).to eql(1)
       o2 = bug2.occurrences.first
-      occurrence.reload.redirect_target_id.should eql(o2.id)
+      expect(occurrence.reload.redirect_target_id).to eql(o2.id)
+    end
+  end
+
+  describe '#resolve' do
+    before :all do
+      @map1 = GemSourceMap::Map.new([
+                                   GemSourceMap::Mapping.new('app/assets/javascripts/example/url.coffee', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(2, 1)),
+                               ], 'http://test.host/example/url.js')
+      @map2 = GemSourceMap::Map.new([
+                                    GemSourceMap::Mapping.new('app/assets/javascripts/source.js', GemSourceMap::Offset.new(3, 140), GemSourceMap::Offset.new(2, 1)),
+                                ], '/example/path.js')
+    end
+
+    it "should resolve a route, line, and column" do
+      map = FactoryGirl.create(:source_map, map: @map1)
+      expect(map.resolve('http://test.host/example/url.js', 3, 144)).
+          to eql(
+                 'file'   => 'app/assets/javascripts/example/url.coffee',
+                 'line'   => 2,
+                 'column' => 1
+             )
+    end
+
+    it "should resolve a URL path, line, and column" do
+      map = FactoryGirl.create(:source_map, map: @map2)
+      expect(map.resolve('http://test.host/example/path.js', 3, 144)).
+          to eql(
+                 'file'   => 'app/assets/javascripts/source.js',
+                 'line'   => 2,
+                 'column' => 1
+             )
     end
   end
 end
diff --git a/spec/models/symbolication_spec.rb b/spec/models/symbolication_spec.rb
index 2531d6c1..051f6847 100644
--- a/spec/models/symbolication_spec.rb
+++ b/spec/models/symbolication_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Symbolication do
+RSpec.describe Symbolication, type: :model do
   context "[hooks]" do
     it "should symbolicate pending occurrences when created" do
       if RSpec.configuration.use_transactional_fixtures
@@ -22,7 +22,7 @@
       end
 
       Project.delete_all
-      project = FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git')
+      project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
       env = FactoryGirl.create(:environment, project: project)
 
       bug        = FactoryGirl.create(:bug,
@@ -39,13 +39,13 @@
                                                           "backtrace" =>
                                                               [{"file" => "lib/better_caller/extensions.rb", "line" => 5, "symbol" => "foo"},
                                                                {"type" => "address", "address" => 1}]}])
-      occurrence.should_not be_symbolicated
+      expect(occurrence).not_to be_symbolicated
 
       symbols = Squash::Symbolicator::Symbols.new
       symbols.add 1, 5, 'lib/better_caller/extensions.rb', 2, 'bar'
       FactoryGirl.create :symbolication, uuid: occurrence.symbolication_id, symbols: symbols
-      occurrence.reload.should be_symbolicated
-      occurrence.redirect_target_id.should be_nil
+      expect(occurrence.reload).to be_symbolicated
+      expect(occurrence.redirect_target_id).to be_nil
     end
 
     it "should reassign to another bug if blame changes" do
@@ -54,7 +54,7 @@
       end
 
       Project.delete_all
-      project = FactoryGirl.create(:project, repository_url: 'git://github.com/RISCfuture/better_caller.git')
+      project = FactoryGirl.create(:project, repository_url: 'https://github.com/RISCfuture/better_caller.git')
       env = FactoryGirl.create(:environment, project: project)
 
       bug1 = FactoryGirl.create(:bug,
@@ -80,9 +80,9 @@
       symbols.add 1, 5, 'lib/better_caller/extensions.rb', 5, 'bar'
       FactoryGirl.create :symbolication, uuid: occurrence.symbolication_id, symbols: symbols
 
-      bug2.occurrences.count.should eql(1)
+      expect(bug2.occurrences.count).to eql(1)
       o2 = bug2.occurrences.first
-      occurrence.reload.redirect_target_id.should eql(o2.id)
+      expect(occurrence.reload.redirect_target_id).to eql(o2.id)
     end
   end
 
@@ -101,14 +101,14 @@
     end
 
     it "should symbolicate an address using lines" do
-      @symbolication.symbolicate(12).should eql(
+      expect(@symbolication.symbolicate(12)).to eql(
                                                 'file' => 'foo.rb',
                                                 'line' => 12
                                             )
     end
 
     it "should symbolicate an address using symbols" do
-      @symbolication.symbolicate(16).should eql(
+      expect(@symbolication.symbolicate(16)).to eql(
                                                 'file'   => 'foo2.rb',
                                                 'line'   => 15,
                                                 'symbol' => 'baz'
@@ -116,7 +116,7 @@
     end
 
     it "should symbolicate an address using lines and symbols" do
-      @symbolication.symbolicate(5).should eql(
+      expect(@symbolication.symbolicate(5)).to eql(
                                                'file'   => 'foo.rb',
                                                'line'   => 7,
                                                'symbol' => 'bar'
@@ -124,7 +124,7 @@
     end
 
     it "should return nil for unsymbolicatable addresses" do
-      @symbolication.symbolicate(50).should be_nil
+      expect(@symbolication.symbolicate(50)).to be_nil
     end
   end
 end
diff --git a/spec/models/user_event_spec.rb b/spec/models/user_event_spec.rb
index 85b46444..e288f0c8 100644
--- a/spec/models/user_event_spec.rb
+++ b/spec/models/user_event_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe UserEvent do
+RSpec.describe UserEvent, type: :model do
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index bf9a2633..7fa8affa 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,54 +12,54 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe User do
+RSpec.describe User, type: :model do
   describe "#gravatar" do
     it "should return the correct Gravatar URL" do
       user = FactoryGirl.create(:user, username: 'gravatar-test')
       Email.where(id: user.emails.first.id).update_all email: 'gravatar-test@example.com'
-      user.reload.gravatar.should eql('http://www.gravatar.com/avatar/db77ada176df02f0a82b5655c95a2705')
+      expect(user.reload.gravatar).to eql('http://www.gravatar.com/avatar/db77ada176df02f0a82b5655c95a2705')
     end if Squash::Configuration.authentication.strategy == 'ldap'
 
     it "should return the correct Gravatar URL" do
-      FactoryGirl.create(:user, email_address: 'gravatar@example.com').gravatar.
-          should eql('http://www.gravatar.com/avatar/0cef130e32e054dd516c99e5181d30c4')
+      expect(FactoryGirl.create(:user, email_address: 'gravatar@example.com').gravatar).
+          to eql('http://www.gravatar.com/avatar/0cef130e32e054dd516c99e5181d30c4')
     end if Squash::Configuration.authentication.strategy == 'password'
   end
 
   describe "#name" do
     it "should return a user's full name" do
-      FactoryGirl.create(:user).name.should eql("Sancho Sample")
+      expect(FactoryGirl.create(:user).name).to eql("Sancho Sample")
     end
 
     it "should handle just a first name" do
-      FactoryGirl.create(:user, last_name: nil).name.should eql("Sancho")
+      expect(FactoryGirl.create(:user, last_name: nil).name).to eql("Sancho")
     end
 
     it "should handle just a last name" do
-      FactoryGirl.create(:user, first_name: nil).name.should eql("Sample")
+      expect(FactoryGirl.create(:user, first_name: nil).name).to eql("Sample")
     end
 
     it "should return the username if no name is given" do
       user = FactoryGirl.create(:user, first_name: nil, last_name: nil)
-      user.name.should eql(user.username)
+      expect(user.name).to eql(user.username)
     end
   end
 
   describe "#email" do
     it "should return the user's corporate email address" do
-      FactoryGirl.create(:user, username: 'email-test').email.should eql("email-test@#{Squash::Configuration.mailer.domain}")
+      expect(FactoryGirl.create(:user, username: 'email-test').email).to eql("email-test@#{Squash::Configuration.mailer.domain}")
     end if Squash::Configuration.authentication.strategy == 'ldap'
 
     it "should return the user's corporate email address" do
-      FactoryGirl.create(:user, email_address: 'email-test@example.com').email.should eql("email-test@example.com")
+      expect(FactoryGirl.create(:user, email_address: 'email-test@example.com').email).to eql("email-test@example.com")
     end if Squash::Configuration.authentication.strategy == 'password'
   end
 
   describe "#distinguished_name" do
     it "should return a user's LDAP DN" do
-      FactoryGirl.create(:user, username: 'dn-test').distinguished_name.should eql("uid=dn-test,#{Squash::Configuration.authentication.ldap.tree_base}")
+      expect(FactoryGirl.create(:user, username: 'dn-test').distinguished_name).to eql("uid=dn-test,#{Squash::Configuration.authentication.ldap.tree_base}")
     end
   end if Squash::Configuration.authentication.strategy == 'ldap'
 
@@ -70,21 +70,21 @@
 
       it "should return :owner for a project owner" do
         @project.update_attribute :owner, @user
-        @user.role(@project).should eql(:owner)
+        expect(@user.role(@project)).to eql(:owner)
       end
 
       it "should return :admin for a project admin" do
         FactoryGirl.create :membership, user: @user, project: @project, admin: true
-        @user.role(@project).should eql(:admin)
+        expect(@user.role(@project)).to eql(:admin)
       end
 
       it "should return :member for a project member" do
         FactoryGirl.create :membership, user: @user, project: @project, admin: false
-        @user.role(@project).should eql(:member)
+        expect(@user.role(@project)).to eql(:member)
       end
 
       it "should return nil otherwise" do
-        @user.role(@project).should be_nil
+        expect(@user.role(@project)).to be_nil
       end
     end
 
@@ -92,90 +92,90 @@
       before(:all) { @comment = FactoryGirl.create(:comment) }
 
       it "should return :creator for the comment creator" do
-        @comment.user.role(@comment).should eql(:creator)
+        expect(@comment.user.role(@comment)).to eql(:creator)
       end
 
       it "should return :owner for a project owner" do
-        @comment.bug.environment.project.owner.role(@comment).should eql(:owner)
+        expect(@comment.bug.environment.project.owner.role(@comment)).to eql(:owner)
       end
 
       it "should return :admin for a project admin" do
         membership = FactoryGirl.create(:membership, project: @comment.bug.environment.project, admin: true)
-        membership.user.role(@comment).should eql(:admin)
+        expect(membership.user.role(@comment)).to eql(:admin)
       end
 
       it "should return nil for a project member" do
         membership = FactoryGirl.create(:membership, project: @comment.bug.environment.project, admin: false)
-        membership.user.role(@comment).should be_nil
+        expect(membership.user.role(@comment)).to be_nil
       end
 
       it "should return nil otherwise" do
-        FactoryGirl.create(:user).role(@comment).should be_nil
+        expect(FactoryGirl.create(:user).role(@comment)).to be_nil
       end
     end
   end
 
   context '[hooks]' do
     it "should downcase the username" do
-      FactoryGirl.create(:user, username: 'TestCase').username.should eql('testcase')
+      expect(FactoryGirl.create(:user, username: 'TestCase').username).to eql('testcase')
     end
   end
 
   describe "#watches?" do
     it "should return a Watch for a watched bug" do
       watch = FactoryGirl.create(:watch)
-      watch.user.watches?(watch.bug).should eql(watch)
+      expect(watch.user.watches?(watch.bug)).to eql(watch)
     end
 
     it "should return nil for an unwatched bug" do
-      FactoryGirl.create(:user).watches?(FactoryGirl.create(:bug)).should be_nil
+      expect(FactoryGirl.create(:user).watches?(FactoryGirl.create(:bug))).to be_nil
     end
   end
 
   describe "#email" do
-    before :all do
+    before :each do
       @user  = FactoryGirl.create(:user)
       @email = FactoryGirl.create(:email, user: @user)
     end
 
     it "should return the primary email" do
-      @user.email.should eql(@user.emails.where(primary: true).first.email)
+      expect(@user.email).to eql(@user.emails.where(primary: true).first.email)
     end
   end
 
   describe "[primary email]" do
     it "should automatically create one" do
       user = FactoryGirl.create(:user, username: 'primary_email_test')
-      user.emails.size.should eql(1)
-      user.emails.first.email.should eql("primary_email_test@#{Squash::Configuration.mailer.domain}")
-      user.emails.first.should be_primary
+      expect(user.emails.size).to eql(1)
+      expect(user.emails.first.email).to eql("primary_email_test@#{Squash::Configuration.mailer.domain}")
+      expect(user.emails.first).to be_primary
     end if Squash::Configuration.authentication.strategy == 'ldap'
 
     it "should automatically create one" do
       user = FactoryGirl.create(:user, username: 'primary_email_test', email_address: 'primary@example.com')
-      user.emails.size.should eql(1)
-      user.emails.first.email.should eql("primary@example.com")
-      user.emails.first.should be_primary
+      expect(user.emails.size).to eql(1)
+      expect(user.emails.first.email).to eql("primary@example.com")
+      expect(user.emails.first).to be_primary
     end if Squash::Configuration.authentication.strategy == 'password'
 
     it "should require a unique email" do
       FactoryGirl.create :user, email_address: 'taken@example.com'
       user = FactoryGirl.build(:user, email_address: 'taken@example.com')
-      user.should_not be_valid
-      user.errors[:email_address].should eql(['has already been taken'])
+      expect(user).not_to be_valid
+      expect(user.errors[:email_address]).to eql(['already taken'])
     end if Squash::Configuration.authentication.strategy == 'password'
   end
 
   context "[password-based authentication]" do
     it "should encrypt the user's password on save" do
-      FactoryGirl.create(:user).crypted_password.should_not be_nil
+      expect(FactoryGirl.create(:user).crypted_password).not_to be_nil
     end
 
     describe "#authentic?" do
       it "should return true for valid credentials and false for invalid credentials" do
         user = FactoryGirl.create(:user, password: 'developers developers developers developers')
-        user.authentic?('developers developers developers').should be_false
-        user.authentic?('developers developers developers developers').should be_true
+        expect(user.authentic?('developers developers developers')).to eql(false)
+        expect(user.authentic?('developers developers developers developers')).to eql(true)
       end
     end
   end if Squash::Configuration.authentication.strategy == 'password'
diff --git a/spec/models/watch_spec.rb b/spec/models/watch_spec.rb
index 5eae5517..ba7f8eab 100644
--- a/spec/models/watch_spec.rb
+++ b/spec/models/watch_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Watch do
+RSpec.describe Watch, type: :model do
   context "[observers]" do
     before :all do
       @user = FactoryGirl.create(:user)
@@ -27,12 +27,12 @@
 
     it "should fill a user's feed with events when a bug is watched" do
       FactoryGirl.create :watch, user: @user, bug: @unwatched_bug
-      @user.user_events.pluck(:event_id).should include(@unwatched_event.id)
+      expect(@user.user_events.pluck(:event_id)).to include(@unwatched_event.id)
     end
 
     it "should remove events from a user's feed when a bug is unwatched" do
       @watch.destroy
-      @user.user_events.pluck(:event_id).should_not include(@watched_event.id)
+      expect(@user.user_events.pluck(:event_id)).not_to include(@watched_event.id)
     end
   end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
new file mode 100644
index 00000000..72e036cb
--- /dev/null
+++ b/spec/rails_helper.rb
@@ -0,0 +1,156 @@
+# Copyright 2014 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require 'spec_helper'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.check_pending!
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir.glob(Rails.root.join('spec', 'support', '**', '*.rb')).each do |file|
+  require file
+end
+
+# Clear out the database to avoid duplicate key conflicts
+Dir[Rails.root.join('app', 'models', '**', '*.rb')].each { |f| require f }
+ActiveRecord::Base.subclasses.each do |model|
+  next if model == ActiveRecord::SchemaMigration
+  model.connection.execute "TRUNCATE #{model.table_name} CASCADE"
+end
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+end
+
+FakeWeb.allow_net_connect = false
+
+require Rails.root.join('config', 'initializers', 'active_record_observer_hooks')
+# see comments in this file for more info
+
+# Logs a user in for spec purposes.
+#
+# @params [User] user A user.
+
+def login_as(user)
+  allow(controller).to receive(:current_user).and_return(user)
+end
+
+# Returns the parameters that would be created when a polymorphic route is hit
+# corresponding to the given model object.
+#
+# @param [ActiveRecord::Base] object A model object.
+# @param [true, false] nested Whether or not there are further route components
+#   nested beneath this one.
+# @param [Hash<Symbol, String>] overrides Additional items to merge into the result hash.
+# @return [Hash<Symbol, String>] The URL parameters.
+#
+# @example
+#   polymorphic_params(some_comment, false) #=> {project_id: 'foo', environment_id: 'development', bug_id: 123, id: 3}
+#   polymorphic_params(some_bug, true) #=> {project_id: 'bar', environment_id: 'test', id: 123}
+
+def polymorphic_params(object, nested, overrides={})
+  hsh = case object
+          when Occurrence
+            {project_id: object.bug.environment.project.to_param, environment_id: object.bug.environment.to_param, bug_id: object.bug.to_param, occurrence_id: object.to_param}
+          when Bug
+            {project_id: object.environment.project.to_param, environment_id: object.environment.to_param, bug_id: object.to_param}
+          when Environment
+            {project_id: object.project.to_param, environment_id: object.to_param}
+          when Comment
+            {project_id: object.bug.environment.project.to_param, environment_id: object.bug.environment.to_param, bug_id: object.bug.to_param, comment_id: object.to_param}
+          when Event
+            {project_id: object.bug.environment.project.to_param, environment_id: object.bug.environment.to_param, bug_id: object.bug.to_param, event_id: object.to_param}
+          when Project
+            {project_id: object.to_param}
+          when Membership
+            {project_id: object.project.to_param, membership_id: object.user.to_param}
+          when Email
+            {id: object.to_param}
+          when User
+            {user_id: object.to_param}
+          else
+            raise ArgumentError, "Unknown model type #{object.class}"
+        end
+
+  unless nested
+    id_key   = hsh.keys.last
+    hsh[:id] = hsh[id_key]
+    hsh.delete id_key
+  end
+
+  return hsh.reverse_merge(overrides)
+end
+
+# Builds a JIRA API URL as used by JIRA-Ruby.
+
+def jira_url(path)
+  host     = Squash::Configuration.jira.api_host
+  root     = Squash::Configuration.jira.api_root
+  user     = Squash::Configuration.jira.authentication.user
+  password = Squash::Configuration.jira.authentication.password
+
+  host = host.gsub('://', "://#{user}:#{password}@")
+  host + root + path
+end
+
+# @return [String] A random 40-digit hex number.
+
+def random_sha
+  40.times.map { rand(16).to_s(16) }.join
+end
+
diff --git a/spec/routing/project/memberships_spec.rb b/spec/routing/project/memberships_spec.rb
index 85bad5b9..9fbc612f 100644
--- a/spec/routing/project/memberships_spec.rb
+++ b/spec/routing/project/memberships_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,12 +12,12 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe "/projects/:project_id/memberships" do
-  describe "/:id [PUT]" do
+RSpec.describe "/projects/:project_id/memberships", type: :routing do
+  describe "/:id [PATCH]" do
     it "should route to usernames with dots in them" do
-      expect(put: '/projects/my-project/memberships/user.dot.json').
+      expect(patch: '/projects/my-project/memberships/user.dot.json').
           to route_to(
                  controller: 'project/memberships',
                  action:     'update',
diff --git a/spec/routing/users_spec.rb b/spec/routing/users_spec.rb
index 9ad6a427..31cb8aad 100644
--- a/spec/routing/users_spec.rb
+++ b/spec/routing/users_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe "/users" do
+RSpec.describe "/users", type: :routing do
   describe "/:id [GET]" do
     it "should route to usernames with dots in them" do
       expect(get: '/users/user.dot').
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 72f18f78..5f226bcc 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,123 +12,87 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
-
-# Clear out the database to avoid duplicate key conflicts
-ActiveRecord::Base.subclasses.each do |model|
-  model.connection.execute "TRUNCATE #{model.table_name} CASCADE"
-end
-
-RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures                 = true
-
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
-  config.infer_base_class_for_anonymous_controllers = false
-end
-
-FakeWeb.allow_net_connect = false
-
-require Rails.root.join('config', 'initializers', 'active_record_observer_hooks')
-# see comments in this file for more info
-
-# Logs a user in for spec purposes.
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
 #
-# @params [User] user A user.
-
-def login_as(user)
-  session[:user_id] = user.id
-end
-
-# Returns the parameters that would be created when a polymorphic route is hit
-# corresponding to the given model object.
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
 #
-# @param [ActiveRecord::Base] object A model object.
-# @param [true, false] nested Whether or not there are further route components
-#   nested beneath this one.
-# @param [Hash<Symbol, String>] overrides Additional items to merge into the result hash.
-# @return [Hash<Symbol, String>] The URL parameters.
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
 #
-# @example
-#   polymorphic_params(some_comment, false) #=> {project_id: 'foo', environment_id: 'development', bug_id: 123, id: 3}
-#   polymorphic_params(some_bug, true) #=> {project_id: 'bar', environment_id: 'test', id: 123}
-
-def polymorphic_params(object, nested, overrides={})
-  hsh = case object
-          when Occurrence
-            {project_id: object.bug.environment.project.to_param, environment_id: object.bug.environment.to_param, bug_id: object.bug.to_param, occurrence_id: object.to_param}
-          when Bug
-            {project_id: object.environment.project.to_param, environment_id: object.environment.to_param, bug_id: object.to_param}
-          when Environment
-            {project_id: object.project.to_param, environment_id: object.to_param}
-          when Comment
-            {project_id: object.bug.environment.project.to_param, environment_id: object.bug.environment.to_param, bug_id: object.bug.to_param, comment_id: object.to_param}
-          when Event
-            {project_id: object.bug.environment.project.to_param, environment_id: object.bug.environment.to_param, bug_id: object.bug.to_param, event_id: object.to_param}
-          when Project
-            {project_id: object.to_param}
-          when Membership
-            {project_id: object.project.to_param, membership_id: object.user.to_param}
-          when Email
-            {id: object.to_param}
-          when User
-            {user_id: object.to_param}
-          else
-            raise ArgumentError, "Unknown model type #{object.class}"
-        end
-
-  unless nested
-    id_key   = hsh.keys.last
-    hsh[:id] = hsh[id_key]
-    hsh.delete id_key
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  return hsh.reverse_merge(overrides)
-end
-
-# Builds a JIRA API URL as used by JIRA-Ruby.
-
-def jira_url(path)
-  host     = Squash::Configuration.jira.api_host
-  root     = Squash::Configuration.jira.api_root
-  user     = Squash::Configuration.jira.authentication.user
-  password = Squash::Configuration.jira.authentication.password
-
-  host = host.gsub('://', "://#{user}:#{password}@")
-  host + root + path
-end
-
-require 'fdoc'
-Fdoc.service_path = 'doc/fdoc'
-Fdoc.decide_success_with do |response, status|
-  status.to_i/100 == 2
-end
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
 
-# @return [String] A random 40-digit hex number.
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
 
-def random_sha
-  40.times.map { rand(16).to_s(16) }.join
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order            = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end
diff --git a/spec/support/controller_404_examples.rb b/spec/support/controller_404_examples.rb
index 5f3cc1f2..e9dac500 100644
--- a/spec/support/controller_404_examples.rb
+++ b/spec/support/controller_404_examples.rb
@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2014 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -12,21 +12,21 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-shared_examples_for "action that 404s at appropriate times" do |method, action, params='{}'|
+RSpec.shared_examples_for "action that 404s at appropriate times" do |method, action, params='{}'|
   it "should only allow projects that exist" do
     send method, action, eval(params).merge(project_id: 'not-found')
-    response.status.should eql(404)
+    expect(response.status).to eql(404)
   end
 
   it "should only allow environments that actually exist within the project" do
     send method, action, eval(params).merge(environment_id: 'not-found')
-    response.status.should eql(404)
+    expect(response.status).to eql(404)
   end
 end
 
-shared_examples_for "singleton action that 404s at appropriate times" do |method, action, params='{}'|
+RSpec.shared_examples_for "singleton action that 404s at appropriate times" do |method, action, params='{}'|
   it "should only find bugs within the current environment" do
     send method, action, eval(params).merge(id: 'not-found')
-    response.status.should eql(404)
+    expect(response.status).to eql(404)
   end
 end
diff --git a/tmp/sourcemaps/.gitignore b/tmp/sourcemaps/.gitignore
new file mode 100644
index 00000000..72e8ffc0
--- /dev/null
+++ b/tmp/sourcemaps/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/vendor/assets/javascripts/sh/XRegExp.js b/vendor/assets/javascripts/sh/XRegExp.js
deleted file mode 100644
index 849351e5..00000000
--- a/vendor/assets/javascripts/sh/XRegExp.js
+++ /dev/null
@@ -1,652 +0,0 @@
-// XRegExp 1.5.0
-// (c) 2007-2010 Steven Levithan
-// MIT License
-// <http://xregexp.com>
-// Provides an augmented, extensible, cross-browser implementation of regular expressions,
-// including support for additional syntax, flags, and methods
-
-var XRegExp;
-
-if (XRegExp) {
-    // Avoid running twice, since that would break references to native globals
-    throw Error("can't load XRegExp twice in the same frame");
-}
-
-// Run within an anonymous function to protect variables and avoid new globals
-(function () {
-
-    //---------------------------------
-    //  Constructor
-    //---------------------------------
-
-    // Accepts a pattern and flags; returns a new, extended `RegExp` object. Differs from a native
-    // regular expression in that additional syntax and flags are supported and cross-browser
-    // syntax inconsistencies are ameliorated
-    XRegExp = function (pattern, flags) {
-        var output = [],
-            currScope = XRegExp.OUTSIDE_CLASS,
-            pos = 0,
-            context, tokenResult, match, chr, regex;
-
-        if (XRegExp.isRegExp(pattern)) {
-            if (flags !== undefined)
-                throw TypeError("can't supply flags when constructing one RegExp from another");
-            return clone(pattern);
-        }
-        // Tokens become part of the regex construction process, so protect against infinite
-        // recursion when an XRegExp is constructed within a token handler or trigger
-        if (isInsideConstructor)
-            throw Error("can't call the XRegExp constructor within token definition functions");
-
-        flags = flags || "";
-        context = { // `this` object for custom tokens
-            hasNamedCapture: false,
-            captureNames: [],
-            hasFlag: function (flag) {return flags.indexOf(flag) > -1;},
-            setFlag: function (flag) {flags += flag;}
-        };
-
-        while (pos < pattern.length) {
-            // Check for custom tokens at the current position
-            tokenResult = runTokens(pattern, pos, currScope, context);
-
-            if (tokenResult) {
-                output.push(tokenResult.output);
-                pos += (tokenResult.match[0].length || 1);
-            } else {
-                // Check for native multicharacter metasequences (excluding character classes) at
-                // the current position
-                if (match = real.exec.call(nativeTokens[currScope], pattern.slice(pos))) {
-                    output.push(match[0]);
-                    pos += match[0].length;
-                } else {
-                    chr = pattern.charAt(pos);
-                    if (chr === "[")
-                        currScope = XRegExp.INSIDE_CLASS;
-                    else if (chr === "]")
-                        currScope = XRegExp.OUTSIDE_CLASS;
-                    // Advance position one character
-                    output.push(chr);
-                    pos++;
-                }
-            }
-        }
-
-        regex = RegExp(output.join(""), real.replace.call(flags, flagClip, ""));
-        regex._xregexp = {
-            source: pattern,
-            captureNames: context.hasNamedCapture ? context.captureNames : null
-        };
-        return regex;
-    };
-
-
-    //---------------------------------
-    //  Public properties
-    //---------------------------------
-
-    XRegExp.version = "1.5.0";
-
-    // Token scope bitflags
-    XRegExp.INSIDE_CLASS = 1;
-    XRegExp.OUTSIDE_CLASS = 2;
-
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var replacementToken = /\$(?:(\d\d?|[$&`'])|{([$\w]+)})/g,
-        flagClip = /[^gimy]+|([\s\S])(?=[\s\S]*\1)/g, // Nonnative and duplicate flags
-        quantifier = /^(?:[?*+]|{\d+(?:,\d*)?})\??/,
-        isInsideConstructor = false,
-        tokens = [],
-        // Copy native globals for reference ("native" is an ES3 reserved keyword)
-        real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }(),
-        compliantLastIndexReset = function () {
-            var x = /x/g;
-            real.replace.call("x", x, "");
-            return !x.lastIndex;
-        }(),
-        hasNativeY = RegExp.prototype.sticky !== undefined,
-        nativeTokens = {};
-
-    // `nativeTokens` match native multicharacter metasequences only (including deprecated octals,
-    // excluding character classes)
-    nativeTokens[XRegExp.INSIDE_CLASS] = /^(?:\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S]))/;
-    nativeTokens[XRegExp.OUTSIDE_CLASS] = /^(?:\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??)/;
-
-
-    //---------------------------------
-    //  Public methods
-    //---------------------------------
-
-    // Lets you extend or change XRegExp syntax and create custom flags. This is used internally by
-    // the XRegExp library and can be used to create XRegExp plugins. This function is intended for
-    // users with advanced knowledge of JavaScript's regular expression syntax and behavior. It can
-    // be disabled by `XRegExp.freezeTokens`
-    XRegExp.addToken = function (regex, handler, scope, trigger) {
-        tokens.push({
-            pattern: clone(regex, "g" + (hasNativeY ? "y" : "")),
-            handler: handler,
-            scope: scope || XRegExp.OUTSIDE_CLASS,
-            trigger: trigger || null
-        });
-    };
-
-    // Accepts a pattern and flags; returns an extended `RegExp` object. If the pattern and flag
-    // combination has previously been cached, the cached copy is returned; otherwise the newly
-    // created regex is cached
-    XRegExp.cache = function (pattern, flags) {
-        var key = pattern + "/" + (flags || "");
-        return XRegExp.cache[key] || (XRegExp.cache[key] = XRegExp(pattern, flags));
-    };
-
-    // Accepts a `RegExp` instance; returns a copy with the `/g` flag set. The copy has a fresh
-    // `lastIndex` (set to zero). If you want to copy a regex without forcing the `global`
-    // property, use `XRegExp(regex)`. Do not use `RegExp(regex)` because it will not preserve
-    // special properties required for named capture
-    XRegExp.copyAsGlobal = function (regex) {
-        return clone(regex, "g");
-    };
-
-    // Accepts a string; returns the string with regex metacharacters escaped. The returned string
-    // can safely be used at any point within a regex to match the provided literal string. Escaped
-    // characters are [ ] { } ( ) * + ? - . , \ ^ $ | # and whitespace
-    XRegExp.escape = function (str) {
-        return str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    };
-
-    // Accepts a string to search, regex to search with, position to start the search within the
-    // string (default: 0), and an optional Boolean indicating whether matches must start at-or-
-    // after the position or at the specified position only. This function ignores the `lastIndex`
-    // property of the provided regex
-    XRegExp.execAt = function (str, regex, pos, anchored) {
-        regex = clone(regex, "g" + ((anchored && hasNativeY) ? "y" : ""));
-        regex.lastIndex = pos = pos || 0;
-        var match = regex.exec(str);
-        if (anchored)
-            return (match && match.index === pos) ? match : null;
-        else
-            return match;
-    };
-
-    // Breaks the unrestorable link to XRegExp's private list of tokens, thereby preventing
-    // syntax and flag changes. Should be run after XRegExp and any plugins are loaded
-    XRegExp.freezeTokens = function () {
-        XRegExp.addToken = function () {
-            throw Error("can't run addToken after freezeTokens");
-        };
-    };
-
-    // Accepts any value; returns a Boolean indicating whether the argument is a `RegExp` object.
-    // Note that this is also `true` for regex literals and regexes created by the `XRegExp`
-    // constructor. This works correctly for variables created in another frame, when `instanceof`
-    // and `constructor` checks would fail to work as intended
-    XRegExp.isRegExp = function (o) {
-        return Object.prototype.toString.call(o) === "[object RegExp]";
-    };
-
-    // Executes `callback` once per match within `str`. Provides a simpler and cleaner way to
-    // iterate over regex matches compared to the traditional approaches of subverting
-    // `String.prototype.replace` or repeatedly calling `exec` within a `while` loop
-    XRegExp.iterate = function (str, origRegex, callback, context) {
-        var regex = clone(origRegex, "g"),
-            i = -1, match;
-        while (match = regex.exec(str)) {
-            callback.call(context, match, ++i, str, regex);
-            if (regex.lastIndex === match.index)
-                regex.lastIndex++;
-        }
-        if (origRegex.global)
-            origRegex.lastIndex = 0;
-    };
-
-    // Accepts a string and an array of regexes; returns the result of using each successive regex
-    // to search within the matches of the previous regex. The array of regexes can also contain
-    // objects with `regex` and `backref` properties, in which case the named or numbered back-
-    // references specified are passed forward to the next regex or returned. E.g.:
-    // var xregexpImgFileNames = XRegExp.matchChain(html, [
-    //     {regex: /<img\b([^>]+)>/i, backref: 1}, // <img> tag attributes
-    //     {regex: XRegExp('(?ix) \\s src=" (?<src> [^"]+ )'), backref: "src"}, // src attribute values
-    //     {regex: XRegExp("^http://xregexp\\.com(/[^#?]+)", "i"), backref: 1}, // xregexp.com paths
-    //     /[^\/]+$/ // filenames (strip directory paths)
-    // ]);
-    XRegExp.matchChain = function (str, chain) {
-        return function recurseChain (values, level) {
-            var item = chain[level].regex ? chain[level] : {regex: chain[level]},
-                regex = clone(item.regex, "g"),
-                matches = [], i;
-            for (i = 0; i < values.length; i++) {
-                XRegExp.iterate(values[i], regex, function (match) {
-                    matches.push(item.backref ? (match[item.backref] || "") : match[0]);
-                });
-            }
-            return ((level === chain.length - 1) || !matches.length) ?
-                matches : recurseChain(matches, level + 1);
-        }([str], 0);
-    };
-
-
-    //---------------------------------
-    //  New RegExp prototype methods
-    //---------------------------------
-
-    // Accepts a context object and arguments array; returns the result of calling `exec` with the
-    // first value in the arguments array. the context is ignored but is accepted for congruity
-    // with `Function.prototype.apply`
-    RegExp.prototype.apply = function (context, args) {
-        return this.exec(args[0]);
-    };
-
-    // Accepts a context object and string; returns the result of calling `exec` with the provided
-    // string. the context is ignored but is accepted for congruity with `Function.prototype.call`
-    RegExp.prototype.call = function (context, str) {
-        return this.exec(str);
-    };
-
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if (match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.toString().slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    // Adds named capture support and fixes browser bugs in native method
-    String.prototype.match = function (regex) {
-        if (!XRegExp.isRegExp(regex))
-            regex = RegExp(regex); // Native `RegExp`
-        if (regex.global) {
-            var result = real.match.apply(this, arguments);
-            regex.lastIndex = 0; // Fix IE bug
-            return result;
-        }
-        return regex.exec(this); // Run the altered `exec`
-    };
-
-    // Adds support for `${n}` tokens for named and numbered backreferences in replacement text,
-    // and provides named backreferences to replacement functions as `arguments[0].name`. Also
-    // fixes cross-browser differences in replacement text syntax when performing a replacement
-    // using a nonregex search value, and the value of replacement regexes' `lastIndex` property
-    // during replacement iterations. Note that this doesn't support SpiderMonkey's proprietary
-    // third (`flags`) parameter
-    String.prototype.replace = function (search, replacement) {
-        var isRegex = XRegExp.isRegExp(search),
-            captureNames, result, str;
-
-        // There are many combinations of search/replacement types/values and browser bugs that
-        // preclude passing to native `replace`, so just keep this check relatively simple
-        if (isRegex && typeof replacement.valueOf() === "string" && replacement.indexOf("${") === -1 && compliantLastIndexReset)
-            return real.replace.apply(this, arguments);
-
-        if (!isRegex)
-            search = search + ""; // Type conversion
-        else if (search._xregexp)
-            captureNames = search._xregexp.captureNames; // Array or `null`
-
-        if (typeof replacement === "function") {
-            result = real.replace.call(this, search, function () {
-                if (captureNames) {
-                    // Change the `arguments[0]` string primitive to a String object which can store properties
-                    arguments[0] = new String(arguments[0]);
-                    // Store named backreferences on `arguments[0]`
-                    for (var i = 0; i < captureNames.length; i++) {
-                        if (captureNames[i])
-                            arguments[0][captureNames[i]] = arguments[i + 1];
-                    }
-                }
-                // Update `lastIndex` before calling `replacement`
-                if (isRegex && search.global)
-                    search.lastIndex = arguments[arguments.length - 2] + arguments[0].length;
-                return replacement.apply(null, arguments);
-            });
-        } else {
-            str = this + ""; // Type conversion, so `args[args.length - 1]` will be a string (given nonstring `this`)
-            result = real.replace.call(str, search, function () {
-                var args = arguments; // Keep this function's `arguments` available through closure
-                return real.replace.call(replacement, replacementToken, function ($0, $1, $2) {
-                    // Numbered backreference (without delimiters) or special variable
-                    if ($1) {
-                        switch ($1) {
-                            case "$": return "$";
-                            case "&": return args[0];
-                            case "`": return args[args.length - 1].slice(0, args[args.length - 2]);
-                            case "'": return args[args.length - 1].slice(args[args.length - 2] + args[0].length);
-                            // Numbered backreference
-                            default:
-                                // What does "$10" mean?
-                                // - Backreference 10, if 10 or more capturing groups exist
-                                // - Backreference 1 followed by "0", if 1-9 capturing groups exist
-                                // - Otherwise, it's the string "$10"
-                                // Also note:
-                                // - Backreferences cannot be more than two digits (enforced by `replacementToken`)
-                                // - "$01" is equivalent to "$1" if a capturing group exists, otherwise it's the string "$01"
-                                // - There is no "$0" token ("$&" is the entire match)
-                                var literalNumbers = "";
-                                $1 = +$1; // Type conversion; drop leading zero
-                                if (!$1) // `$1` was "0" or "00"
-                                    return $0;
-                                while ($1 > args.length - 3) {
-                                    literalNumbers = String.prototype.slice.call($1, -1) + literalNumbers;
-                                    $1 = Math.floor($1 / 10); // Drop the last digit
-                                }
-                                return ($1 ? args[$1] || "" : "$") + literalNumbers;
-                        }
-                    // Named backreference or delimited numbered backreference
-                    } else {
-                        // What does "${n}" mean?
-                        // - Backreference to numbered capture n. Two differences from "$n":
-                        //   - n can be more than two digits
-                        //   - Backreference 0 is allowed, and is the entire match
-                        // - Backreference to named capture n, if it exists and is not a number overridden by numbered capture
-                        // - Otherwise, it's the string "${n}"
-                        var n = +$2; // Type conversion; drop leading zeros
-                        if (n <= args.length - 3)
-                            return args[n];
-                        n = captureNames ? indexOf(captureNames, $2) : -1;
-                        return n > -1 ? args[n + 1] : $0;
-                    }
-                });
-            });
-        }
-
-        if (isRegex && search.global)
-            search.lastIndex = 0; // Fix IE bug
-
-        return result;
-    };
-
-    // A consistent cross-browser, ES3 compliant `split`
-    String.prototype.split = function (s /* separator */, limit) {
-        // If separator `s` is not a regex, use the native `split`
-        if (!XRegExp.isRegExp(s))
-            return real.split.apply(this, arguments);
-
-        var str = this + "", // Type conversion
-            output = [],
-            lastLastIndex = 0,
-            match, lastLength;
-
-        // Behavior for `limit`: if it's...
-        // - `undefined`: No limit
-        // - `NaN` or zero: Return an empty array
-        // - A positive number: Use `Math.floor(limit)`
-        // - A negative number: No limit
-        // - Other: Type-convert, then use the above rules
-        if (limit === undefined || +limit < 0) {
-            limit = Infinity;
-        } else {
-            limit = Math.floor(+limit);
-            if (!limit)
-                return [];
-        }
-
-        // This is required if not `s.global`, and it avoids needing to set `s.lastIndex` to zero
-        // and restore it to its original value when we're done using the regex
-        s = XRegExp.copyAsGlobal(s);
-
-        while (match = s.exec(str)) { // Run the altered `exec` (required for `lastIndex` fix, etc.)
-            if (s.lastIndex > lastLastIndex) {
-                output.push(str.slice(lastLastIndex, match.index));
-
-                if (match.length > 1 && match.index < str.length)
-                    Array.prototype.push.apply(output, match.slice(1));
-
-                lastLength = match[0].length;
-                lastLastIndex = s.lastIndex;
-
-                if (output.length >= limit)
-                    break;
-            }
-
-            if (s.lastIndex === match.index)
-                s.lastIndex++;
-        }
-
-        if (lastLastIndex === str.length) {
-            if (!real.test.call(s, "") || lastLength)
-                output.push("");
-        } else {
-            output.push(str.slice(lastLastIndex));
-        }
-
-        return output.length > limit ? output.slice(0, limit) : output;
-    };
-
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    // Supporting function for `XRegExp`, `XRegExp.copyAsGlobal`, etc. Returns a copy of a `RegExp`
-    // instance with a fresh `lastIndex` (set to zero), preserving properties required for named
-    // capture. Also allows adding new flags in the process of copying the regex
-    function clone (regex, additionalFlags) {
-        if (!XRegExp.isRegExp(regex))
-            throw TypeError("type RegExp expected");
-        var x = regex._xregexp;
-        regex = XRegExp(regex.source, getNativeFlags(regex) + (additionalFlags || ""));
-        if (x) {
-            regex._xregexp = {
-                source: x.source,
-                captureNames: x.captureNames ? x.captureNames.slice(0) : null
-            };
-        }
-        return regex;
-    };
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function runTokens (pattern, index, scope, context) {
-        var i = tokens.length,
-            result, match, t;
-        // Protect against constructing XRegExps within token handler and trigger functions
-        isInsideConstructor = true;
-        // Must reset `isInsideConstructor`, even if a `trigger` or `handler` throws
-        try {
-            while (i--) { // Run in reverse order
-                t = tokens[i];
-                if ((scope & t.scope) && (!t.trigger || t.trigger.call(context))) {
-                    t.pattern.lastIndex = index;
-                    match = t.pattern.exec(pattern); // Running the altered `exec` here allows use of named backreferences, etc.
-                    if (match && match.index === index) {
-                        result = {
-                            output: t.handler.call(context, match, scope),
-                            match: match
-                        };
-                        break;
-                    }
-                }
-            }
-        } catch (err) {
-            throw err;
-        } finally {
-            isInsideConstructor = false;
-        }
-        return result;
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-
-    //---------------------------------
-    //  Built-in tokens
-    //---------------------------------
-
-    // Augment XRegExp's regular expression syntax and flags. Note that when adding tokens, the
-    // third (`scope`) argument defaults to `XRegExp.OUTSIDE_CLASS`
-
-    // Comment pattern: (?# )
-    XRegExp.addToken(
-        /\(\?#[^)]*\)/,
-        function (match) {
-            // Keep tokens separated unless the following token is a quantifier
-            return real.test.call(quantifier, match.input.slice(match.index + match[0].length)) ? "" : "(?:)";
-        }
-    );
-
-    // Capturing group (match the opening parenthesis only).
-    // Required for support of named capturing groups
-    XRegExp.addToken(
-        /\((?!\?)/,
-        function () {
-            this.captureNames.push(null);
-            return "(";
-        }
-    );
-
-    // Named capturing group (match the opening delimiter only): (?<name>
-    XRegExp.addToken(
-        /\(\?<([$\w]+)>/,
-        function (match) {
-            this.captureNames.push(match[1]);
-            this.hasNamedCapture = true;
-            return "(";
-        }
-    );
-
-    // Named backreference: \k<name>
-    XRegExp.addToken(
-        /\\k<([\w$]+)>/,
-        function (match) {
-            var index = indexOf(this.captureNames, match[1]);
-            // Keep backreferences separate from subsequent literal numbers. Preserve back-
-            // references to named groups that are undefined at this point as literal strings
-            return index > -1 ?
-                "\\" + (index + 1) + (isNaN(match.input.charAt(match.index + match[0].length)) ? "" : "(?:)") :
-                match[0];
-        }
-    );
-
-    // Empty character class: [] or [^]
-    XRegExp.addToken(
-        /\[\^?]/,
-        function (match) {
-            // For cross-browser compatibility with ES3, convert [] to \b\B and [^] to [\s\S].
-            // (?!) should work like \b\B, but is unreliable in Firefox
-            return match[0] === "[]" ? "\\b\\B" : "[\\s\\S]";
-        }
-    );
-
-    // Mode modifier at the start of the pattern only, with any combination of flags imsx: (?imsx)
-    // Does not support x(?i), (?-i), (?i-m), (?i: ), (?i)(?m), etc.
-    XRegExp.addToken(
-        /^\(\?([imsx]+)\)/,
-        function (match) {
-            this.setFlag(match[1]);
-            return "";
-        }
-    );
-
-    // Whitespace and comments, in free-spacing (aka extended) mode only
-    XRegExp.addToken(
-        /(?:\s+|#.*)+/,
-        function (match) {
-            // Keep tokens separated unless the following token is a quantifier
-            return real.test.call(quantifier, match.input.slice(match.index + match[0].length)) ? "" : "(?:)";
-        },
-        XRegExp.OUTSIDE_CLASS,
-        function () {return this.hasFlag("x");}
-    );
-
-    // Dot, in dotall (aka singleline) mode only
-    XRegExp.addToken(
-        /\./,
-        function () {return "[\\s\\S]";},
-        XRegExp.OUTSIDE_CLASS,
-        function () {return this.hasFlag("s");}
-    );
-
-
-    //---------------------------------
-    //  Backward compatibility
-    //---------------------------------
-
-    // Uncomment the following block for compatibility with XRegExp 1.0-1.2:
-    /*
-    XRegExp.matchWithinChain = XRegExp.matchChain;
-    RegExp.prototype.addFlags = function (s) {return clone(this, s);};
-    RegExp.prototype.execAll = function (s) {var r = []; XRegExp.iterate(s, this, function (m) {r.push(m);}); return r;};
-    RegExp.prototype.forEachExec = function (s, f, c) {return XRegExp.iterate(s, this, f, c);};
-    RegExp.prototype.validate = function (s) {var r = RegExp("^(?:" + this.source + ")$(?!\\s)", getNativeFlags(this)); if (this.global) this.lastIndex = 0; return s.search(r) === 0;};
-    */
-
-})();
-
-// CommonJS
-typeof(exports) != 'undefined' ? exports.XRegExp = XRegExp : null;
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushAS3.js b/vendor/assets/javascripts/sh/brushes/shBrushAS3.js
deleted file mode 100644
index 844ed2c6..00000000
--- a/vendor/assets/javascripts/sh/brushes/shBrushAS3.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * SyntaxHighlighter
- * http://alexgorbatchev.com/
- *
- * SyntaxHighlighter is donationware. If you are using it, please donate.
- * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
- *
- * @version
- * 2.0.320 (May 03 2009)
- * 
- * @copyright
- * Copyright (C) 2004-2009 Alex Gorbatchev.
- *
- * @license
- * This file is part of SyntaxHighlighter.
- * 
- * SyntaxHighlighter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * SyntaxHighlighter is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with SyntaxHighlighter.  If not, see <http://www.gnu.org/copyleft/lesser.html>.
- */
-SyntaxHighlighter.brushes.AS3 = function() {
-	
-	// Created by Gabriel Mariani @ http://blog.coursevector.com
-	
-	var primaryKeywords =	'class dynamic extends implements import interface new case do while else if for ' +
-							'in switch throw intrinsic private public static get set function var try catch finally ' +
-							'while with default break continue delete return final each label internal native ' +
-							'override protected const namespace package include use AS3';
-	
-	var secondaryKeywords =	'super this null Infinity -Infinity NaN undefined true false is as instanceof typeof';
-	
-	var additionalKeywords = 	'void Null ArgumentError arguments Array Boolean Class Date DefinitionError Error EvalError ' +
-								'Function int Math Namespace Number Object QName RangeError ReferenceError RegExp SecurityError ' +
-								'String SyntaxError TypeError uint URIError	VerifyError XML XMLList Accessibility ' +
-								'AccessibilityProperties ActionScriptVersion AVM1Movie Bitmap BitmapData BitmapDataChannel ' +
-								'BlendMode CapsStyle DisplayObject DisplayObjectContainer FrameLabel GradientType Graphics ' +
-								'IBitmapDrawable InteractiveObject InterpolationMethod JointStyle LineScaleMode Loader LoaderInfo ' +
-								'MorphShape MovieClip PixelSnapping Scene Shape SimpleButton SpreadMethod Sprite Stage StageAlign ' +
-								'StageDisplayState StageQuality StageScaleMode SWFVersion EOFError IllegalOperationError ' +
-								'InvalidSWFError IOError MemoryError ScriptTimeoutError StackOverflowError ActivityEvent ' +
-								'AsyncErrorEvent ContextMenuEvent DataEvent ErrorEvent Event EventDispatcher EventPhase FocusEvent ' +
-								'FullScreenEvent HTTPStatusEvent IEventDispatcher IMEEvent IOErrorEvent KeyboardEvent MouseEvent ' +
-								'NetStatusEvent ProgressEvent SecurityErrorEvent StatusEvent SyncEvent TextEvent TimerEvent ' +
-								'ExternalInterface BevelFilter BitmapFilter BitmapFilterQuality BitmapFilterType BlurFilter ' +
-								'ColorMatrixFilter ConvolutionFilter DisplacementMapFilter DisplacementMapFilterMode ' +
-								'DropShadowFilter GlowFilter GradientBevelFilter GradientGlowFilter ColorTransform Matrix Point ' +
-								'Rectangle Transform Camera ID3Info Microphone Sound SoundChannel SoundLoaderContext SoundMixer ' +
-								'SoundTransform Video FileFilter FileReference FileReferenceList IDynamicPropertyOutput ' +
-								'IDynamicPropertyWriter LocalConnection	NetConnection NetStream ObjectEncoding Responder ' +
-								'SharedObject SharedObjectFlushStatus Socket URLLoader URLLoaderDataFormat URLRequest ' +
-								'URLRequestHeader URLRequestMethod URLStream URLVariables XMLSocket	PrintJob PrintJobOptions ' +
-								'PrintJobOrientation ApplicationDomain Capabilities IME IMEConversionMode LoaderContext	Security ' +
-								'SecurityDomain SecurityPanel System AntiAliasType CSMSettings Font FontStyle FontType GridFitType ' +
-								'StaticText StyleSheet TextColorType TextDisplayMode TextField TextFieldAutoSize TextFieldType TextFormat ' +
-								'TextFormatAlign TextLineMetrics TextRenderer TextSnapshot ContextMenu ContextMenuBuiltInItems ' +
-								'ContextMenuItem Keyboard KeyLocation Mouse ByteArray Dictionary Endian IDataInput IDataOutput ' +
-								'IExternalizable Proxy Timer XMLDocument XMLNode XMLNodeType' +
-								
-								/* Global Methods */
-								'decodeURI decodeURIComponent encodeURI encodeURIComponent escape isFinite isNaN isXMLName ' +
-								'parseFloat parseInt trace unescape ' +
-								
-								/* Flash 10 */
-								'NetStreamPlayOptions ShaderParameter NetStreamInfo DigitCase FontWeight Kerning FontDescription ' +
-								'LigatureLevel RenderingMode TextElement FontPosture TextLineValidity TextLineCreationResult ' +
-								'BreakOpportunity ContentElement TabStop TabAlignment JustificationStyle FontMetrics TextLineMirrorRegion ' +
-								'TextLine CFFHinting ElementFormat GraphicElement DigitWidth TextJustifier TextBlock GroupElement ' +
-								'TypographicCase EastAsianJustifier LineJustification SpaceJustifier FontLookup TextRotation TextBaseline ' +
-								'TriangleCulling ShaderData GraphicsEndFill ColorCorrectionSupport ShaderInput GraphicsGradientFill ' +
-								'GraphicsPathWinding GraphicsStroke ShaderParameterType IGraphicsStroke ShaderJob GraphicsBitmapFill ' +
-								'IGraphicsData Shader GraphicsPath IGraphicsFill GraphicsShaderFill ShaderPrecision IDrawCommand ' +
-								'GraphicsTrianglePath ColorCorrection GraphicsPathCommand IGraphicsPath GraphicsSolidFill ShaderFilter ' +
-								'NetStreamPlayTransitions SoundCodec ContextMenuClipboardItems MouseCursor ClipboardTransferMode Clipboard ' +
-								'ClipboardFormats Vector';
-	
-	var documentationKeywords = '@author @copy @default @deprecated @eventType @example @exampleText @exception @haxe @inheritDoc @internal @link ' +
-								'@mtasc @mxmlc @param @private @return @see @serial @serialData @serialField @since @throws @usage @version';
-	
-	this.regexList = [
-		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,			css: 'comments' },				// one line comments
-		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,				css: 'comments' },				// multiline comments
-		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,				css: 'string' },				// double quoted strings
-		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,				css: 'string' },				// single quoted strings
-		{ regex: /^\\s*#.*/gm,												css: 'preprocessor' },			// preprocessor tags like #region and #endregion
-		{ regex: /\/.*\/[gism]+/g,											css: 'constants' },				// regex
-		{ regex: new RegExp(this.getKeywords(documentationKeywords), 'gm'),	css: 'color1' },				// documentation keywords
-		{ regex: new RegExp(this.getKeywords(primaryKeywords), 'gm'),		css: 'keyword' },				// primary keywords
-		{ regex: new RegExp(this.getKeywords(secondaryKeywords), 'gm'),		css: 'color2' },				// secondary keywords
-		{ regex: /\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi,						css: 'value' },					// numbers
-		{ regex: new RegExp(this.getKeywords(additionalKeywords), 'gm'),	css: 'color3' }					// additional keywords
-		];
-	
-	this.forHtmlScript(SyntaxHighlighter.regexLib.scriptScriptTags);
-};
-
-SyntaxHighlighter.brushes.AS3.prototype	= new SyntaxHighlighter.Highlighter();
-SyntaxHighlighter.brushes.AS3.aliases	= ['actionscript3', 'as3'];
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushAppleScript.js b/vendor/assets/javascripts/sh/brushes/shBrushAppleScript.js
deleted file mode 100644
index d40bbd7d..00000000
--- a/vendor/assets/javascripts/sh/brushes/shBrushAppleScript.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * SyntaxHighlighter
- * http://alexgorbatchev.com/SyntaxHighlighter
- *
- * SyntaxHighlighter is donationware. If you are using it, please donate.
- * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
- *
- * @version
- * 3.0.83 (July 02 2010)
- * 
- * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
- *
- * @license
- * Dual licensed under the MIT and GPL licenses.
- */
-;(function()
-{
-	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
-
-	function Brush()
-	{
-		// AppleScript brush by David Chambers
-		// http://davidchambersdesign.com/
-		var keywords   = 'after before beginning continue copy each end every from return get global in local named of set some that the then times to where whose with without';
-		var ordinals   = 'first second third fourth fifth sixth seventh eighth ninth tenth last front back middle';
-		var specials   = 'activate add alias AppleScript ask attachment boolean class constant delete duplicate empty exists false id integer list make message modal modified new no paragraph pi properties quit real record remove rest result reveal reverse run running save string true word yes';
-
-		this.regexList = [
-
-			{ regex: /(--|#).*$/gm,
-			    css: 'comments' },
-
-			{ regex: /\(\*(?:[\s\S]*?\(\*[\s\S]*?\*\))*[\s\S]*?\*\)/gm, // support nested comments
-			    css: 'comments' },
-
-			{ regex: /"[\s\S]*?"/gm,
-			    css: 'string' },
-
-			{ regex: /(?:,|:|¬|'s\b|\(|\)|\{|\}|«|\b\w*»)/g,
-			    css: 'color1' },
-
-			{ regex: /(-)?(\d)+(\.(\d)?)?(E\+(\d)+)?/g, // numbers
-			    css: 'color1' },
-
-			{ regex: /(?:&(amp;|gt;|lt;)?|=|� |>|<|≥|>=|≤|<=|\*|\+|-|\/|÷|\^)/g,
-			    css: 'color2' },
-
-			{ regex: /\b(?:and|as|div|mod|not|or|return(?!\s&)(ing)?|equals|(is(n't| not)? )?equal( to)?|does(n't| not) equal|(is(n't| not)? )?(greater|less) than( or equal( to)?)?|(comes|does(n't| not) come) (after|before)|is(n't| not)?( in)? (back|front) of|is(n't| not)? behind|is(n't| not)?( (in|contained by))?|does(n't| not) contain|contain(s)?|(start|begin|end)(s)? with|((but|end) )?(consider|ignor)ing|prop(erty)?|(a )?ref(erence)?( to)?|repeat (until|while|with)|((end|exit) )?repeat|((else|end) )?if|else|(end )?(script|tell|try)|(on )?error|(put )?into|(of )?(it|me)|its|my|with (timeout( of)?|transaction)|end (timeout|transaction))\b/g,
-			    css: 'keyword' },
-
-			{ regex: /\b\d+(st|nd|rd|th)\b/g, // ordinals
-			    css: 'keyword' },
-
-			{ regex: /\b(?:about|above|against|around|at|below|beneath|beside|between|by|(apart|aside) from|(instead|out) of|into|on(to)?|over|since|thr(ough|u)|under)\b/g,
-			    css: 'color3' },
-
-			{ regex: /\b(?:adding folder items to|after receiving|choose( ((remote )?application|color|folder|from list|URL))?|clipboard info|set the clipboard to|(the )?clipboard|entire contents|display(ing| (alert|dialog|mode))?|document( (edited|file|nib name))?|file( (name|type))?|(info )?for|giving up after|(name )?extension|quoted form|return(ed)?|second(?! item)(s)?|list (disks|folder)|text item(s| delimiters)?|(Unicode )?text|(disk )?item(s)?|((current|list) )?view|((container|key) )?window|with (data|icon( (caution|note|stop))?|parameter(s)?|prompt|properties|seed|title)|case|diacriticals|hyphens|numeric strings|punctuation|white space|folder creation|application(s( folder)?| (processes|scripts position|support))?|((desktop )?(pictures )?|(documents|downloads|favorites|home|keychain|library|movies|music|public|scripts|sites|system|users|utilities|workflows) )folder|desktop|Folder Action scripts|font(s| panel)?|help|internet plugins|modem scripts|(system )?preferences|printer descriptions|scripting (additions|components)|shared (documents|libraries)|startup (disk|items)|temporary items|trash|on server|in AppleTalk zone|((as|long|short) )?user name|user (ID|locale)|(with )?password|in (bundle( with identifier)?|directory)|(close|open for) access|read|write( permission)?|(g|s)et eof|using( delimiters)?|starting at|default (answer|button|color|country code|entr(y|ies)|identifiers|items|name|location|script editor)|hidden( answer)?|open(ed| (location|untitled))?|error (handling|reporting)|(do( shell)?|load|run|store) script|administrator privileges|altering line endings|get volume settings|(alert|boot|input|mount|output|set) volume|output muted|(fax|random )?number|round(ing)?|up|down|toward zero|to nearest|as taught in school|system (attribute|info)|((AppleScript( Studio)?|system) )?version|(home )?directory|(IPv4|primary Ethernet) address|CPU (type|speed)|physical memory|time (stamp|to GMT)|replacing|ASCII (character|number)|localized string|from table|offset|summarize|beep|delay|say|(empty|multiple) selections allowed|(of|preferred) type|invisibles|showing( package contents)?|editable URL|(File|FTP|News|Media|Web) [Ss]ervers|Telnet hosts|Directory services|Remote applications|waiting until completion|saving( (in|to))?|path (for|to( (((current|frontmost) )?application|resource))?)|POSIX (file|path)|(background|RGB) color|(OK|cancel) button name|cancel button|button(s)?|cubic ((centi)?met(re|er)s|yards|feet|inches)|square ((kilo)?met(re|er)s|miles|yards|feet)|(centi|kilo)?met(re|er)s|miles|yards|feet|inches|lit(re|er)s|gallons|quarts|(kilo)?grams|ounces|pounds|degrees (Celsius|Fahrenheit|Kelvin)|print( (dialog|settings))?|clos(e(able)?|ing)|(de)?miniaturized|miniaturizable|zoom(ed|able)|attribute run|action (method|property|title)|phone|email|((start|end)ing|home) page|((birth|creation|current|custom|modification) )?date|((((phonetic )?(first|last|middle))|computer|host|maiden|related) |nick)?name|aim|icq|jabber|msn|yahoo|address(es)?|save addressbook|should enable action|city|country( code)?|formatte(r|d address)|(palette )?label|state|street|zip|AIM [Hh]andle(s)?|my card|select(ion| all)?|unsaved|(alpha )?value|entr(y|ies)|group|(ICQ|Jabber|MSN) handle|person|people|company|department|icon image|job title|note|organization|suffix|vcard|url|copies|collating|pages (across|down)|request print time|target( printer)?|((GUI Scripting|Script menu) )?enabled|show Computer scripts|(de)?activated|awake from nib|became (key|main)|call method|of (class|object)|center|clicked toolbar item|closed|for document|exposed|(can )?hide|idle|keyboard (down|up)|event( (number|type))?|launch(ed)?|load (image|movie|nib|sound)|owner|log|mouse (down|dragged|entered|exited|moved|up)|move|column|localization|resource|script|register|drag (info|types)|resigned (active|key|main)|resiz(e(d)?|able)|right mouse (down|dragged|up)|scroll wheel|(at )?index|should (close|open( untitled)?|quit( after last window closed)?|zoom)|((proposed|screen) )?bounds|show(n)?|behind|in front of|size (mode|to fit)|update(d| toolbar item)?|was (hidden|miniaturized)|will (become active|close|finish launching|hide|miniaturize|move|open|quit|(resign )?active|((maximum|minimum|proposed) )?size|show|zoom)|bundle|data source|movie|pasteboard|sound|tool(bar| tip)|(color|open|save) panel|coordinate system|frontmost|main( (bundle|menu|window))?|((services|(excluded from )?windows) )?menu|((executable|frameworks|resource|scripts|shared (frameworks|support)) )?path|(selected item )?identifier|data|content(s| view)?|character(s)?|click count|(command|control|option|shift) key down|context|delta (x|y|z)|key( code)?|location|pressure|unmodified characters|types|(first )?responder|playing|(allowed|selectable) identifiers|allows customization|(auto saves )?configuration|visible|image( name)?|menu form representation|tag|user(-| )defaults|associated file name|(auto|needs) display|current field editor|floating|has (resize indicator|shadow)|hides when deactivated|level|minimized (image|title)|opaque|position|release when closed|sheet|title(d)?)\b/g,
-			    css: 'color3' },
-
-			{ regex: new RegExp(this.getKeywords(specials), 'gm'), css: 'color3' },
-			{ regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' },
-			{ regex: new RegExp(this.getKeywords(ordinals), 'gm'), css: 'keyword' }
-		];
-	};
-
-	Brush.prototype = new SyntaxHighlighter.Highlighter();
-	Brush.aliases = ['applescript'];
-
-	SyntaxHighlighter.brushes.AppleScript = Brush;
-
-	// CommonJS
-	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
-})();
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushClojure.js b/vendor/assets/javascripts/sh/brushes/shBrushClojure.js
deleted file mode 100644
index b5c6c507..00000000
--- a/vendor/assets/javascripts/sh/brushes/shBrushClojure.js
+++ /dev/null
@@ -1,25 +0,0 @@
-SyntaxHighlighter.brushes.Clojure = function()
-{
-        // Contributed by Travis Whitton
-
-        var funcs = ':arglists :doc :file :line :macro :name :ns :private :tag :test new alias alter ' +
-                    'and apply assert class cond conj count def defmacro defn defstruct deref do '     +
-                    'doall dorun doseq dosync eval filter finally find first fn gen-class gensym if '  +
-                    'import inc keys let list loop map ns or print println quote rand recur reduce '   +
-                    'ref repeat require rest send seq set sort str struct sync take test throw '       +
-                    'trampoline try type use var vec when while';
-
-        this.regexList = [
-                { regex: new RegExp(';[^\]]+$', 'gm'),                           css: 'comments' },
-		{ regex: SyntaxHighlighter.regexLib.multiLineDoubleQuotedString, css: 'string' },
-                { regex: /\[|\]/g,                                               css: 'keyword' },
-		{ regex: /'[a-z][A-Za-z0-9_]*/g,                                 css: 'color1' }, // symbols
-		{ regex: /:[a-z][A-Za-z0-9_]*/g,                                 css: 'color2' }, // keywords
-		{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),             css: 'functions' }
-            ];
- 
-	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
-}
-
-SyntaxHighlighter.brushes.Clojure.prototype     = new SyntaxHighlighter.Highlighter(); 
-SyntaxHighlighter.brushes.Clojure.aliases       = ['clojure', 'Clojure', 'clj'];
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushLua.js b/vendor/assets/javascripts/sh/brushes/shBrushLua.js
deleted file mode 100644
index 97cb3f8a..00000000
--- a/vendor/assets/javascripts/sh/brushes/shBrushLua.js
+++ /dev/null
@@ -1,18 +0,0 @@
-SyntaxHighlighter.brushes.Lua = function()
-{
-	var keywords =	'break do end else elseif function if local nil not or repeat return and then until while this';
-	var funcs = 'math\\.\\w+ string\\.\\w+ os\\.\\w+ debug\\.\\w+ io\\.\\w+ error fopen dofile coroutine\\.\\w+ arg getmetatable ipairs loadfile loadlib loadstring longjmp print rawget rawset seek setmetatable assert tonumber tostring';
-
-	this.regexList = [
-		{ regex: new RegExp('--\\[\\[[\\s\\S]*\\]\\]--', 'gm'),		css: 'comments' },
-		{ regex: new RegExp('--[^\\[]{2}.*$', 'gm'),			    css: 'comments' },	// one line comments
-		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,     css: 'string' },    // strings
-		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,     css: 'string' },    // strings
-		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' },	// keyword
-		{ regex: new RegExp(this.getKeywords(funcs), 'gm'),		    css: 'func' }		// functions
-		];
-}
-
-SyntaxHighlighter.brushes.Lua.prototype	= new SyntaxHighlighter.Highlighter();
-SyntaxHighlighter.brushes.Lua.aliases = ['lua'];
-
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushObjC.js b/vendor/assets/javascripts/sh/brushes/shBrushObjC.js
deleted file mode 100644
index 7567560e..00000000
--- a/vendor/assets/javascripts/sh/brushes/shBrushObjC.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * SyntaxHighlighter
- * http://alexgorbatchev.com/SyntaxHighlighter
- *
- * SyntaxHighlighter is donationware. If you are using it, please donate.
- * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
- *
- * @version
- * 3.0.83 (July 02 2010)
- * 
- * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
- *
- * @license
- * Dual licensed under the MIT and GPL licenses.
- */
-;(function()
-{
-	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
-
-	function Brush()
-	{
-		// Copyright 2006 Shin, YoungJin
-		// Copyright 2011 Scott Densmore
-	
-		var datatypes =	'ATOM BOOL BOOLEAN BYTE CHAR COLORREF DWORD DWORDLONG DWORD_PTR ' +
-						'DWORD32 DWORD64 FLOAT HACCEL HALF_PTR HANDLE HBITMAP HBRUSH ' +
-						'HCOLORSPACE HCONV HCONVLIST HCURSOR HDC HDDEDATA HDESK HDROP HDWP ' +
-						'HENHMETAFILE HFILE HFONT HGDIOBJ HGLOBAL HHOOK HICON HINSTANCE HKEY ' +
-						'HKL HLOCAL HMENU HMETAFILE HMODULE HMONITOR HPALETTE HPEN HRESULT ' +
-						'HRGN HRSRC HSZ HWINSTA HWND INT INT_PTR INT32 INT64 LANGID LCID LCTYPE ' +
-						'LGRPID LONG LONGLONG LONG_PTR LONG32 LONG64 LPARAM LPBOOL LPBYTE LPCOLORREF ' +
-						'LPCSTR LPCTSTR LPCVOID LPCWSTR LPDWORD LPHANDLE LPINT LPLONG LPSTR LPTSTR ' +
-						'LPVOID LPWORD LPWSTR LRESULT PBOOL PBOOLEAN PBYTE PCHAR PCSTR PCTSTR PCWSTR ' +
-						'PDWORDLONG PDWORD_PTR PDWORD32 PDWORD64 PFLOAT PHALF_PTR PHANDLE PHKEY PINT ' +
-						'PINT_PTR PINT32 PINT64 PLCID PLONG PLONGLONG PLONG_PTR PLONG32 PLONG64 POINTER_32 ' +
-						'POINTER_64 PSHORT PSIZE_T PSSIZE_T PSTR PTBYTE PTCHAR PTSTR PUCHAR PUHALF_PTR ' +
-						'PUINT PUINT_PTR PUINT32 PUINT64 PULONG PULONGLONG PULONG_PTR PULONG32 PULONG64 ' +
-						'PUSHORT PVOID PWCHAR PWORD PWSTR SC_HANDLE SC_LOCK SERVICE_STATUS_HANDLE SHORT ' +
-						'SIZE_T SSIZE_T TBYTE TCHAR UCHAR UHALF_PTR UINT UINT_PTR UINT32 UINT64 ULONG ' +
-						'ULONGLONG ULONG_PTR ULONG32 ULONG64 USHORT USN VOID WCHAR WORD WPARAM WPARAM WPARAM ' +
-						'char bool short int __int32 __int64 __int8 __int16 long float double __wchar_t ' +
-						'clock_t _complex _dev_t _diskfree_t div_t ldiv_t _exception _EXCEPTION_POINTERS ' +
-						'FILE _finddata_t _finddatai64_t _wfinddata_t _wfinddatai64_t __finddata64_t ' +
-						'__wfinddata64_t _FPIEEE_RECORD fpos_t _HEAPINFO _HFILE lconv intptr_t id ' +
-						'jmp_buf mbstate_t _off_t _onexit_t _PNH ptrdiff_t _purecall_handler ' +
-						'sig_atomic_t size_t _stat __stat64 _stati64 terminate_function ' +
-						'time_t __time64_t _timeb __timeb64 tm uintptr_t _utimbuf ' +
-						'va_list wchar_t wctrans_t wctype_t wint_t signed';
-
-		var keywords =	'break case catch class copy const __finally __exception __try ' +
-						'const_cast continue private public protected __declspec ' +
-						'default delete deprecated dllexport dllimport do dynamic_cast ' +
-						'else enum explicit extern if for friend getter goto inline ' +
-						'mutable naked namespace new nil NO noinline nonatomic noreturn nothrow NULL ' +
-						'readonly readwrite register reinterpret_cast retain return SEL selectany self ' +
-						'setter sizeof static static_cast struct super switch template this ' +
-						'thread throw true false try typedef typeid typename union ' +
-						'using uuid virtual void volatile whcar_t while YES';
-					
-		var functions =	'assert isalnum isalpha iscntrl isdigit isgraph islower isprint' +
-						'ispunct isspace isupper isxdigit tolower toupper errno localeconv ' +
-						'setlocale acos asin atan atan2 ceil cos cosh exp fabs floor fmod ' +
-						'frexp ldexp log log10 modf pow sin sinh sqrt tan tanh jmp_buf ' +
-						'longjmp setjmp raise signal sig_atomic_t va_arg va_end va_start ' +
-						'clearerr fclose feof ferror fflush fgetc fgetpos fgets fopen ' +
-						'fprintf fputc fputs fread freopen fscanf fseek fsetpos ftell ' +
-						'fwrite getc getchar gets perror printf putc putchar puts remove ' +
-						'rename rewind scanf setbuf setvbuf sprintf sscanf tmpfile tmpnam ' +
-						'ungetc vfprintf vprintf vsprintf abort abs atexit atof atoi atol ' +
-						'bsearch calloc div exit free getenv labs ldiv malloc mblen mbstowcs ' +
-						'mbtowc qsort rand realloc srand strtod strtol strtoul system ' +
-						'wcstombs wctomb memchr memcmp memcpy memmove memset strcat strchr ' +
-						'strcmp strcoll strcpy strcspn strerror strlen strncat strncmp ' +
-						'strncpy strpbrk strrchr strspn strstr strtok strxfrm asctime ' +
-						'clock ctime difftime gmtime localtime mktime strftime time';
-
-		this.regexList = [
-			{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },			// one line comments
-			{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
-			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// strings
-			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// strings
-			{ regex: /^ *#.*/gm,										css: 'preprocessor' },
-			{ regex: /^#!.*$/gm,										css: 'preprocessor' },
-			{ regex: new RegExp(this.getKeywords(datatypes), 'gm'),		css: 'keyword bold' },
-			{ regex: new RegExp(this.getKeywords(functions), 'gm'),		css: 'functions bold' },
-			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword bold' },
-			{ regex: new RegExp('\\bNS\\w+\\b', 'gm'),					css: 'keyword bold' },
-			{ regex: new RegExp('\\bUI\\w+\\b', 'gm'),					css: 'keyword bold' },
-			{ regex: new RegExp('\\bIB\\w+\\b', 'gm'),					css: 'keyword bold' },
-			{ regex: new RegExp('@\\w+\\b', 'gm'),						css: 'keyword bold' }
-			];
-	};
-
-	Brush.prototype	= new SyntaxHighlighter.Highlighter();
-	Brush.aliases	= ['obj-c', 'objc'];
-
-	SyntaxHighlighter.brushes.Cpp = Brush;
-
-	// CommonJS
-	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
-})();
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushPhp.js b/vendor/assets/javascripts/sh/brushes/shBrushPhp.js
deleted file mode 100644
index 584da984..00000000
--- a/vendor/assets/javascripts/sh/brushes/shBrushPhp.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * SyntaxHighlighter
- * http://alexgorbatchev.com/
- *
- * SyntaxHighlighter is donationware. If you are using it, please donate.
- * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
- *
- * @version
- * 2.0.320.modified (May 03 2009)
- *
- * @copyright
- * Copyright (C) 2004-2009 Alex Gorbatchev.
- *
- * @license
- * This file is a modified version of shBrushPhp.js which is part of SyntaxHighlighter.
- *
- * SyntaxHighlighter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * SyntaxHighlighter is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with SyntaxHighlighter.  If not, see <http://www.gnu.org/copyleft/lesser.html>.
- *
- * shBrushPhp.js by David Chambers
- * http://davidchambersdesign.com/
- * { last updated: 20 March 2010 }
- */
-SyntaxHighlighter.brushes.Php = function ()
-{
-	this.regexList = [
-
-		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,
-		    css: 'php-comment comments' },
-
-		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,
-		    css: 'php-comment comments' },
-
-		{ regex: /__(CLASS|FILE|FUNCTION|LINE|METHOD)__/gi,
-		    css: 'php-constant constants' },
-
-		{ regex: /\b(?:abstract|and|array|as|break|case|class|const|continue|declare|default|die|do|echo|else(( )?if)?|end(declare|for(each)?|if|switch|while)|extends|false|for(each)?|(c|old_)?function|implements|include(_once)?|global|if|interface|new|(x)?or|private|protected|public|return|static|switch|throw|true|use|require(_once)?|var|while)\b/g,
-		    css: 'php-keyword keyword' },
-
-		{ regex: /(&lt;|<)\?(php|=)?|\?(&gt;|>)/g,
-		    css: 'php-tag' },
-
-		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,
-		    css: 'php-string string' },
-
-		{ regex: /[^$\w](\\"|\\\$|[^"$\n])*(?=("|(\\"|[^"\n])*[^\\]")(((\\"|[^"\n])*[^\\]"){2})*(\\"|[^"\n])*$)(")?/gm,
-		    css: 'php-string string' },
-
-		{ regex: /"(?=(((\\"|[^"\n])*[^\\]"){2})*(\\"|[^"\n])*$)/gm,
-		    css: 'php-string string' },
-
-		{ regex: /\b\d+(\.\d+)?\b/g,
-		    css: 'php-numval' },
-
-		{ regex: /\$\w+(?=("|(\\"|[^"\n])*[^\\]")(((\\"|[^"\n])*[^\\]"){2})*(\\"|[^"\n])*$)/gm,
-		    css: 'php-varinstr variable' },
-
-		{ regex: /\$\w+/g,
-		    css: 'php-variable variable' },
-
-		// functions a-e
-		{ regex: /\b(?:abs|acos(h)?|add(c)?slashes|aggregate(_(info|methods(_by_(list|regexp))?|properties(_by_(list|regexp))?))?|aggregation_info|apache_(child_terminate|get(env|_(modules|version))|lookup_uri|note|request_headers|reset_timeout|response_headers|setenv)|apc_(add|cache_info|clear_cache|compile_file|define_constants|delete|fetch|load_constants|sma_info|store)|apd_(breakpoint|callstack|clunk|continue|croak|dump_(function_table|(persistent|regular)_resources)|echo|get_active_symbols|set_(pprof_trace|session(_trace(_socket)?)?))|array(_(change_key_case|chunk|combine|count_values|diff(_((u)?assoc|(u)?key))?|fill(_keys)?|filter|flip|intersect(_((u)?assoc|(u)?key))?|key(s|_exists)|map|merge(_recursive)?|multisort|pad|pop|product|push|rand|reduce|reverse|search|shift|s(p)?lice|sum|udiff(_(u)?assoc)?|uintersect(_(u)?assoc)?|unique|unshift|values|walk(_recursive)?))?|arsort|ascii2ebcdic|asin(h)?|asort|assert(_options)?|atan(2|h)?|base(64_(de|en)code|_convert|name)|bbcode_(add_(element|smiley)|create|destroy|parse|set_(arg_parser|flags))|bc(add|comp|div|mod|mul|pow(mod)?|scale|sqrt|sub)|bcompiler_(load(_exe)?|parse_class|read|write_(class|constant|exe_footer|file|write_(file|footer|function(s_from_file)?|header|included_filename)))|bin2hex|bind(ec|textdomain|_textdomain_codeset)|bz(close|(de)?compress|err(or|no|str)|flush|open|read|write)|cal(cul(_)?hmac|_(days_in_month|from_jd|info|to_jd))|call_user_(func|method)(_array)?|ceil|ch(dir|eck(date|dnsrr)|grp|mod|op|own|r(oot)?|unk_split)|class(kit_(import|method_(add|copy|re(define|move|name)))|_(exists|implements|parents))|clearstatcache|close(dir|log)|collator|com(pact|_(addref|create_guid|event_sink|get(_active_object)?|invoke|isenum|load(_typelib)?|message_pump|print_typeinfo|prop(get|put|set)|release|set))|connection_(aborted|status|timeout)|const(ant|ruct)|convert_(cyr_string|uu(de|en)code)|copy|cos(h)?|count(er_(bump(_value)?|create|get(_(meta|named|value))?|reset(_value)?)|_chars)?|crack_(check|(close|open)dict|getlastmessage)|crc32|create_function|crypt|ctype_(alnum|alpha|cntrl|digit|graph|lower|print|punct|space|upper|xdigit)|curl_(close|copy_handle|err(or|no)|exec|getinfo|init|multi_(add_handle|close|exec|getcontent|info_read|init|remove_handle|select)|setopt(_array)?|version)|current|cyrus_(authenticate|(un)?bind|close|connect|query)|date(interval|period|time(zone)?|_(add|create(_from_format)?|date_set|default_timezone_(g|s)et|diff|format|get_last_errors|interval_(create_from_date_string|format)|isodate_set|modify|offset_get|parse(_from_format)?|sub|sun(rise|set|_info)|time((stamp|zone)_(g|s)et|_set)))?|db2_(autocommit|bind_param|client_info|close|column(s|_privileges)|commit|conn(ect|_error(msg)?)|cursor_type|escape_string|exec(ute)?|fetch_(array|assoc|both|object|row)|field_(display_size|name|num|precision|scale|type|width)|foreign_keys|free_(result|stmt)|get_option|last_insert_id|lob_read|next_result|num_(fields|rows)|pclose|pconnect|prepare|primary_keys|procedure(s|_columns)|result|rollback|server_info|set_option|special_columns|statistics|stmt_error(msg)?|table(s|_privileges))|dba_(close|delete|exists|fetch|firstkey|handlers|insert|key_split|list|nextkey|(p)?open|optimize|replace|sync)|dbase_(add_record|close|create|delete_record|get_(header_info|record(_with_names)?)|num(fields|records)|open|pack|replace_record)|dbplus_(add|aql|chdir|close|curr|err(code|no)|find|first|flush|free((all|r)locks|lock)|get(lock|unique)|info|last|(x)?(un)?lockrel|next|open|prev|rchperm|rcreate|rcrtexact|rcrtlike|resolve|restorepos|rkeys|ropen|rquery|rrename|rsecindex|runlink|rzap|savepos|setindex(bynumber)?|sql|tcl|tremove|undo(prepare)?|unselect|update)|dbx_(close|compare|connect|error|escape_string|fetch_row|query|sort)|dc(n)?gettext|deaggregate|debug_((print_)?backtrace|zval_dump)|dec(bin|hex|oct)|define(d|_syslog_variables)?|deg2rad|delete|dgettext|die|dio_(close|fcntl|open|read|seek|stat|tcsetattr|truncate|write)|dir(ectoryiterator|name)?|disk(_(free|total)_|free)space|dl|dngettext|dns_(check_record|get_(mx|record))|dom_import_simplexml|domxml_(new_doc|open_(file|mem)|version|xmltree|xslt_(stylesheet(_(doc|file))?|version))|dotnet_load|doubleval|each|easter_da(te|ys)|ebcdic2ascii|empty|enchant_(broker_(describe|dict_exists|free(_dict)?|get_error|init|list_dicts|request_(pwl_)?dict|set_ordering)|dict_(add_to_(personal|session)|(quick_)?check|describe|get_error|is_in_session|store_replacement|suggest))|end|ereg(i)?(_replace)?|error_(get_last|log|reporting)|escapeshell(arg|cmd)|eval|exec|exif_(imagetype|read_data|tagname|thumbnail)|exit|exp(ect_(expectl|popen)|lode|m1)?|extension_loaded|extract|ezmlm_hash)\b/g,
-		    css: 'php-function functions' },
-
-		// functions f-h
-		{ regex: /\b(?:fam_((cancel|resume|suspend)_monitor|close|monitor_(collection|directory|file)|next_event|open|pending)|fbsql_(affected_rows|autocommit|blob_size|change_user|clob_size|close|commit|connect|create_(blob|clob|db)|data(base(_password)?|_seek)|db_(query|status)|drop_db|err(or|no)|fetch_(array|assoc|field|lengths|object|row)|field_(flags|len|name|seek|table|type)|free_result|get_autostart_info|hostname|insert_id|list_(dbs|fields|tables)|next_result|num_(fields|rows)|password|pconnect|query|read_(b|c)lob|result|rollback|rows_fetched|select_db|set_(characterset|lob_mode|password|transaction)|(start|stop)_db|(table(_)?|user)name|warnings)|fclose|fdf_(add_(doc_javascript|template)|close|create|enum_values|err(or|no)|get_(ap|attachment|encoding|file|flags|opt|status|value|version)|header|next_field_name|open(_string)?|remove_item|save(_string)?|set_(ap|encoding|file|flags|javascript_action|on_import_javascript|opt|status|submit_form_action|target_frame|value|version))|feof|(f)?flush|fget(c(sv)?|s(s)?)|file((a|c)time|group|inode|mtime|owner|perms|pro(_(field(count|name|type|width)|retrieve|rowcount))?|size|type|_(exists|(get|put)_contents))?|filter_(has_var|id|input(_array)?|list|var(_array)?)|finfo_(buffer|close|file|open|set_flags)|floatval|flock|floor|fmod|fnmatch|fopen|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|fribidi_log2vis|fscanf|fseek|fsockopen|fstat|ftell|ftok|ftp_(alloc|cdup|chdir|chmod|close|connect|delete|exec|fget|fput|get(_option)?|login|mdtm|mkdir|nb_(continue|(f)?get|(f)?put)|nlist|pasv|put|pwd|quit|raw(list)?|rename|rmdir|set_option|si(t|z)e|ssl_connect|systype)|ftruncate|func(tion_exists|_(get_arg(s)?|num_args))|fwrite|gc_(collect_cycles|disable|enable(d)?)|gd_info|geoip_((continent_code|country_(code(3)?|name)|id|isp|org|record|region)_by_name|database_info|db_(avail|filename|get_all_info)|region_name_by_code|time_zone_by_country_and_region)|get(allheaders|cwd|date|env|hostby(addr|name(l)?)|imagesize|lastmod|mxrr|my((g|p|u)id|inode)|opt|protoby(name|number)|randmax|rusage|servby(name|port)|text|timeofday|type|_(browser|called_class|cfg_var|class(_(methods|vars))?|current_user|declared_(classes|interfaces)|defined_(constants|functions|vars)|extension_funcs|headers|html_translation_table|include(d_files|_path)|loaded_extensions|magic_quotes_(gpc|runtime)|meta_tags|object_vars|parent_class|required_files|resource_type))|glob|gm(date|mktime)|gmp_(abs|add|and|clrbit|cmp|com|div(exact|_(q(r)?|r))?|fact|gcd(ext)?|hamdist|init|intval|invert|jacobi|legendre|mod|mul|neg|nextprime|or|perfect_square|popcount|pow(m)?|prob_prime|random|scan(0|1)|setbit|sign|sqrt(rem)?|strval|sub|testbit|xor)|gmstrftime|gnupg_(add((de|en)cryptkey|signkey)|clear((de|en)cryptkeys|signkeys)|decrypt(verify)?|encrypt(sign)?|export|get(error|protocol)|import|init|keyinfo|set(armor|(error|sign)mode)|sign|verify)|gopher_parsedir|grapheme_(extract|str(len|(r)?(i)?pos|(i)?str)|substr)|gregoriantojd|gz(close|(un)?compress|(de|en)code|(de|in)flate|eof|file|get(c|s(s)?)|open|passthru|puts|read|rewind|seek|tell|write)|__halt_compiler|hash(_(algos|copy|file|final|hmac(_file)?|init|update(_(file|stream))?))?|header(s_(list|sent))?|hebrev(c)?|hexdec|highlight_(file|string)|html(entities|specialchars(_decode)?|_entity_decode)|http_(build_(cookie|query|str|url)|cache_(etag|last_modified)|chunked_decode|date|(de|in)flate|get(_request_(body(_stream)?|headers))?|head|match_(etag|modified|request_header)|negotiate_(charset|content_type|language)|parse_(cookie|headers|message|params)|persistent_handles_(clean|count|ident)|post_(data|fields)|put_(data|file|stream)|redirect|request(_(body_encode|method_(exists|name|(un)?register)?))?|send_(content_(disposition|type)|data|file|last_modified|status|stream)|support|throttle)|hw_(array2objrec|changeobject|children(obj)?|close|connect(ion_info)?|cp|deleteobject|docbyanchor(obj)?|document_(attributes|bodytag|(set)?content|size)|dummy|edittext|error(msg)?|free_document|get(anchors(obj)?|andlock|child(doc)?coll(obj)?|object(byquery(coll)?(obj)?)?|parents(obj)?|rellink|remote(children)?|srcbydestobj|text|username)|identify|incollections|info|inscoll|insdoc|insert(anchors|document|object)|mapid|modifyobject|mv|(new_|pipe)document|objrec2array|output_document|pconnect|(setlink)?root|stat|unlock|who)|hypot)\b/g,
-		    css: 'php-function functions' },
-
-		// functions i-k
-		{ regex: /\b(?:ibase_(add_user|affected_rows|backup|blob_(add|cancel|close|create|echo|get|import|info|open)|close|commit(_ret)?|connect|db_info|delete_user|drop_db|err(code|msg)|execute|fetch_(assoc|object|row)|field_info|free_(event_handler|query|result)|gen_id|maintain_db|modify_user|name_result|num_(fields|params)|param_info|pconnect|prepare|query|restore|rollback(_ret)?|server_info|service_(at|de)tach|set_event_handler|timefmt|trans|wait_event)|iconv(_(get_encoding|mime_(decode(_headers)?|encode)|set_encoding|str(len|pos|rpos)|substr))?|id3_(get_(frame_(long|short)_name|genre_(id|list|name)|tag|version)|(remove|set)_tag)|idate|ifx(us_(close|create|free|open|read|seek|tell|write)_slob|_(affected_rows|blobinfile_mode|byteasvarchar|close|connect|copy_blob|create_(blob|char)|do|error(msg)?|fetch_row|field(properties|types)|free_(blob|char|result)|get(sqlca|_(blob|char))|htmltbl_result|nullformat|num_(fields|rows)|pconnect|prepare|query|textasvarchar|update_(blob|char)))|ignore_user_abort|iis_(add_server|get_(dir_security|script_map|server_(by_(comment|path)|rights)|service_state)|remove_server|set_(app_settings|dir_security|script_map|server_rights)|st(art|op)_serv(er|ice))|image(2wbmp|alphablending|antialias|arc|char(up)?|color(allocate(alpha)?|at|closest(alpha|hwb)?|deallocate|exact(alpha)?|match|resolve(alpha)?|set|sforindex|stotal|transparent)|convolution|copy(merge(gray)?|resampled|resized)?|create(from(gd(2(part)?)?|gif|jpeg|png|string|wbmp|xbm|xpm)|truecolor)?|dashedline|destroy|ellipse|fill(ed(arc|ellipse|polygon|rectangle)|toborder)?|filter|font(height|width)|ftbbox|fttext|gammacorrect|gd(2)?|gif|grab(screen|window)|interlace|istruecolor|jpeg|layereffect|line|loadfont|palettecopy|png|polygon|ps(bbox|(encode|extend|free|load|slant)font|text)|rectangle|rotate|savealpha|set(brush|pixel|style|thickness|tile)|string(up)?|sx|sy|truecolortopalette|ttf(bbox|text)|types|wbmp|xbm|_type_to_(extension|mime_type))|imap_(8bit|alerts|append|base64|binary|body(struct)?|check|clearflag_full|close|createmailbox|delete(mailbox)?|errors|expunge|fetch(body|header|structure|_overview)|get(acl|mailboxes|subscribed|_quota(root)?)|header(s|info)?|last_error|list(mailbox|scan|subscribed)?|lsub|mail(boxmsginfo|_(compose|copy|move))?|mime_header_decode|msgno|num_(msg|recent)|open|ping|qprint|renamemailbox|reopen|rfc822_(parse_(adrlist|headers)|write_address)|savebody|scanmailbox|search|set(acl|flag_full|_quota)|sort|status|subscribe|thread|timeout|uid|undelete|unsubscribe|utf(7_(de|en)code|8))|implode|import_request_variables|in_array|include(_once)?|inclued_get_data|inet_(ntop|pton)|ingres_(autocommit(_state)?|charset|close|commit|connect|cursor|err(or|no|sqlstate)|escape_string|execute|fetch_(array|object|proc_return|row)|field_(length|name|nullable|precision|scale|type)|free_result|next_error|num_(fields|rows)|pconnect|prepare|query|result_seek|rollback|set_environment|unbuffered_query)|ini_(alter|get(_all)?|restore|set)|inotify_(add_watch|init|queue_len|read|rm_watch)|interface_exists|intl_(error_name|get_error_(code|message)|is_failure)|intval|ip2long|iptc(embed|parse)|is(set|_(a(rray)?|binary|bool|buffer|callable|dir|double|executable|file|(in)?finite|float|int(eger)?|link|long|nan|null|numeric|object|readable|real|resource|scalar|soap_fault|string|subclass_of|unicode|uploaded_file|writ(e)?able))|iterator_(apply|count|to_array)|java_last_exception_(clear|get)|jd(dayofweek|monthname|to(french|gregorian|jewish|julian|unix))|jewishtojd|join|jpeg2wbmp|json_((de|en)code|last_error)|juliantojd|kadm5_((chpass|create|delete|modify)_principal|destroy|flush|get_(policies|principal(s)?)|init_with_password)|key|k(r)?sort)\b/g,
-		    css: 'php-function functions' },
-
-		// functions l-m
-		{ regex: /\b(?:lcfirst|lcg_value|lch(grp|own)|ldap_(8859_to_t61|add|(un)?bind|close|compare|connect|count_entries|delete|dn2ufn|err(or|2str|no)|explode_dn|first_(attribute|entry|reference)|free_result|get_(attributes|dn|entries|option|values(_len)?)|list|mod(ify|_(add|del|replace))|next_(attribute|entry|reference)|parse_(reference|result)|read|rename|sasl_bind|search|set_(option|rebind_proc)|sort|start_tls|t61_to_8859)|lengthexception|levenshtein|libxml(error|_((clear|use_internal)_errors|get_(errors|last_error)|set_streams_context))|limititerator|link(info)?|list|locale(conv|_(g|s)et_default)?|localtime|log(icexception|10|1p)?|long2ip|lstat|ltrim|lzf_((de)?compress|optimized_for)|m_(checkstatus|completeauthorizations|connect(ionerror)?|deletetrans|destroy(conn|engine)|get(cell(bynum)?|commadelimited|header)|init(conn|engine)|iscommadelimited|maxconntimeout|monitor|num(columns|rows)|parsecommadelimited|response(keys|param)|returnstatus|set(blocking|dropfile|ip|ssl(_(cafile|files))?|timeout)|sslcert_gen_hash|trans(actionssent|inqueue|keyval|new|send)|uwait|validateidentifier|verify(connection|sslcert))|mail(parse_(determine_best_xfer_encoding|msg_(create|extract_(part|(whole_)?part_file)?|free|get_(part(_data)?|structure)|parse(_file)?)|rfc822_parse_addresses|stream_encode|uudecode_all))?|main|max(db_(affected_rows|autocommit|bind_(param|result)|change_user|character_set_name|client_encoding|close(_long_data)?|commit|connect(_err(or|no))?|data_seek|debug|disable_(reads_from_master|rpl_parse)|dump_debug_info|embedded_connect|enable_(reads_from_master|rpl_parse)|err(or|no)|escape_string|execute|fetch(_(array|assoc|field(s|_direct)?|lengths|object|row))?|field_(count|seek|tell)|free_result|get_(client_(info|version)|host_info|metadata|proto_info|server_(info|version))|info|init|insert_id|kill|master_query|more_results|multi_query|next_result|num_(fields|rows)|options|param_count|ping|prepare|query|real_(connect|escape_string|query)|report|rollback|rpl_(parse_enabled|probe|query_type)|select_db|send_(long_data|query)|server_(end|init)|set_opt|sqlstate|ssl_set|stat|stmt_(affected_rows|bind_(param|result)|close(_long_data)?|data_seek|err(or|no)|execute|fetch|free_result|init|num_rows|param_count|prepare|reset|result_metadata|send_long_data|sqlstate|store_result)|store_result|thread_(id|safe)|use_result|warning_count))?|mb_(check_encoding|convert_(case|encoding|kana|variables)|(de|en)code_(mimeheader|numericentity)|detect_(encoding|order)|ereg(i(_replace)?|_(match|replace|search(_(get(pos|regs)?|init|(set)?pos|regs))?))?|get_info|http_(in|out)put|internal_encoding|language|list_encodings|output_handler|parse_str|preferred_mime_name|regex_(encoding|set_options)|send_mail|split|str(cut|imwidth|istr|len|(r)?(i)?pos|r(i)?chr|str|to(lower|upper)|width)|sub(stitute_character|str(_count)?))|mcrypt_(cbc|cfb|create_iv|(de|en)crypt|ecb|enc_(get_(algorithms_name|(block|iv|key)_size|modes_name|supported_key_sizes)|is_block_(algorithm(_mode)?|mode)|self_test)|generic(_(deinit|end|init))?|get_((block|iv|key)_size|cipher_name)|list_(algorithms|modes)|module_(close|get_(algo_(block|key)_size|supported_key_sizes)|is_block_(algorithm(_mode)?|mode)|open|self_test)|ofb)|md5(_file)?|mdecrypt_generic|memcache_debug|memory_get_(peak_)?usage|metaphone|method_exists|mhash(_(count|get_(block_size|hash_name)|keygen_s2k))?|microtime|mime_content_type|min|ming_(keypress|set(cubicthreshold|scale|swfcompression)|use(constants|swfversion))|mk(dir|time)|money_format|move_uploaded_file|mqseries_(back|begin|close|cmit|conn(x)?|disc|get|inq|open|put(1)?|set|strerror)|msession_(connect|count|create|destroy|disconnect|find|(g|s)et(_(array|data))?|inc|list(var)?|lock|plugin|randstr|timeout|uniq|unlock)|msg_(((g|s)et|stat)_queue|queue_exists|receive|remove_queue|send)|msql(_(affected_rows|close|connect|create(_)?db|data_seek|db(name|_query)?|drop_db|error|fetch_(array|field|object|row)|field(_seek|(_)?(flags|len|name|table|type))|free_result|list_(dbs|fields|tables)|num(_)?(fields|rows)|pconnect|query|regcase|result|select_db|tablename))?|mssql_(bind|close|connect|data_seek|execute|fetch_(array|assoc|batch|field|object|row)|field_(length|name|seek|type)|free_(result|statement)|get_last_message|guid_string|init|min_(error|message)_severity|next_result|num_(fields|rows)|pconnect|query|result|rows_affected|select_db)|mt_(getrandmax|(s)?rand)|mysql_(affected_rows|change_user|client_encoding|close|connect|(create|drop|select)_db|data_seek|db_(name|query)|err(or|no)|escape_string|fetch_(array|assoc|field|lengths|object|row)|field_(flags|len|name|seek|table|type)|free_result|get_(client|host|proto|server)_info|info|insert_id|list_(dbs|fields|processes|tables)|num_(fields|rows)|pconnect|ping|query|real_escape_string|result|set_charset|stat|tablename|thread_id|unbuffered_query)|mysqli_(bind_(param|result)|client_encoding|(dis|en)able_(reads_from_master|rpl_parse)|driver|escape_string|execute|fetch|get_metadata|master_query|param_count|report|result|rpl_(parse_enabled|probe|query_type)|send_(long_data|query)|set_opt|slave_query|stmt))\b/g,
-		    css: 'php-function functions' },
-
-		// functions n-o
-		{ regex: /\b(?:nat(case)?sort|ncurses_(add(ch|(ch)?(n)?str)|assume_default_colors|attr(off|on|set)|baudrate|beep|bkgd(set)?|border|bottom_panel|can_change_color|cbreak|clear|clrto(bot|eol)|color_(content|set)|curs_set|def(ine_key|_(prog|shell)_mode)|del(ay_output|ch|eteln|win|_panel)|doupdate|(echo|erase)(char)?|end|filter|flash|flushinp|get(ch|maxyx|mouse|yx)|halfdelay|has_(colors|ic|il|key)|hide_panel|hline|inch|init(_(color|pair))?|ins(ertln|ch|delln|str|tr)|isendwin|key(ok|pad)|killchar|longname|meta|mouse(interval|mask|_trafo)|move(_panel)?|mv(add(ch|(ch)?(n)?str)|cur|delch|getch|hline|inch|vline|waddstr)|napms|new(pad|win|_panel)|nl|no(cbreak|echo|nl|qiflush|raw)|pair_content|panel_(above|below|window)|p(nout)?refresh|putp|qiflush|raw|refresh|replace_panel|reset_(prog|shell)_mode|(res|sav)etty|scr(l|_(dump|init|restore|set))|show_panel|slk_(attr(off|on|set)?|clear|color|init|(nout)?refresh|restore|set|touch)|stand(end|out)|start_color|term(attrs|name)|timeout|top_panel|typeahead|unget(ch|mouse)|update_panels|use_(default_colors|env|extended_names)|vidattr|vline|w(add(ch|str)|attr(off|on|set)|border|clear|color_set|erase|getch|hline|mouse_trafo|move|(nout)?refresh|stand(end|out)|vline))|newt_(bell|button(_bar)?|centered_window|checkbox(_(get_value|set_(flags|value)|tree(_((add|find)_item|get_(current|entry_value|(multi_)?selection)|multi|set_(current|entry(_value)?|width)))?))?|clear_key_buffer|cls|compact_button|component_(add_callback|takes_focus)|create_grid|cursor_(off|on)|delay|draw_(form|root_text)|entry(_(get_value|set(_(filter|flags))?))?|finished|form(_(add_(component(s)?|hot_key)|destroy|get_current|run|set_(background|height|size|timer|width)|watch_fd))?|get_screen_size|grid_(add_components_to_form|basic_window|free|get_size|(h|v)_(close_)?stacked|place|set_field|simple_window|wrapped_window(_at)?)|init|label(_set_text)?|listbox(_(append_entry|clear(_selection)?|delete_entry|get_(current|selection)|insert_entry|item_count|select_item|set_(current(_by_key)?|data|entry|width)))?|listitem(_(get_data|set))?|open_window|pop_(help_line|window)|push_help_line|radio(button|_get_current)|redraw_help_line|reflow_text|refresh|resize_screen|resume|run_form|scale(_set)?|scrollbar_set|set_(help|suspend)_callback|suspend|textbox(_(get_num_lines|reflowed|set_(height|text)))?|vertical_scrollbar|wait_for_key|win_(choice|entries|menu|message(v)?|ternary))|next|ngettext|nl2br|nl_langinfo|normalizer|notes_(body|(copy|drop)_db|create_(db|note)|find_note|header_info|list_msgs|mark_(un)?read|nav_create|search|unread|version)|nsapi_((request|response)_headers|virtual)|nthmac|number_format|numberformatter|oauth_(get_sbs|urlencode)|ob_(clean|deflatehandler|end_(clean|flush)|etaghandler|flush|get_(clean|contents|flush|length|level|status)|gzhandler|iconv_handler|implicit_flush|inflatehandler|list_handlers|start|tidyhandler)|oci(bindbyname|cancel|closelob|coll(append|assign(elem)?|getelem|max|size|trim)|column(isnull|name|precision|scale|size|type(raw)?)|commit|definebyname|error|execute|fetch(into|statement)?|free(collection|cursor|desc|statement)|internaldebug|loadlob|log(off|on)|new(collection|cursor|descriptor)|nlogon|numcols|parse|plogon|result|rollback|rowcount|savelob(file)?|serverversion|setprefetch|statementtype|write(lobtofile|temporarylob)|_(bind_(array_)?by_name|cancel|close|commit|connect|define_by_name|error|execute|fetch(_(all|array|assoc|object|row))?|field_(is_null|name|precision|scale|size|type(_raw)?)|free_statement|internal_debug|lob_is_equal|new_(collection|connect|cursor|descriptor)|num_(fields|rows)|parse|password_change|pconnect|result|rollback|server_version|set_prefetch|statement_type))|octdec|odbc_(autocommit|binmode|close(_all)?|column(s|privileges)|commit|connect|cursor|data_source|do|error(msg)?|exec(ute)?|fetch_(array|into|object|row)|field_(len|name|num|precision|scale|type)|foreignkeys|free_result|gettypeinfo|longreadlen|next_result|num_(fields|rows)|pconnect|prepare|primarykeys|procedure(s|columns)|result(_all)?|rollback|setoption|specialcolumns|statistics|table(s|privileges))|openal_(buffer_(create|data|destroy|get|loadwav)|context_(create|current|destroy|process|suspend)|device_(close|open)|listener_(g|s)et|source_(create|destroy|get|pause|play|rewind|set|stop)|stream)|open(dir|log)|openssl_(csr_(export(_to_file)?|get_(public_key|subject)|new|sign)|error_string|free_key|get_(private|public)key|open|pkcs12_(export(_to_file)?|read)|pkcs7_((de|en)crypt|sign|verify)|pkey_(export(_to_file)?|free|get_(details|private|public)|new)|(private|public)_(de|en)crypt|seal|sign|verify|x509_(check(purpose|_private_key)|export(_to_file)?|free|parse|read))|ord|output_(add_rewrite_var|reset_rewrite_vars)|overload|override_function|ovrimos_(close|commit|connect|cursor|exec(ute)?|fetch_(into|row)|field_(len|name|num|type)|free_result|longreadlen|num_(fields|rows)|prepare|result(_all)?|rollback))\b/g,
-		    css: 'php-function functions' },
-
-		// functions p-r
-		{ regex: /\b(?:pack|parentiterator|parse(kit_(compile_(file|string)|func_arginfo)|_(ini_(file|string)|str|url))|passthru|pathinfo|pclose|pcntl_(alarm|exec|fork|(g|s)etpriority|signal(_dispatch)?|sig(procmask|timedwait|waitinfo)|wait(pid)?|w(exitstatus|if(exited|signaled|stopped)|(stop|term)sig))|pfsockopen|pg_(affected_rows|cancel_query|client_encoding|close|connect(ion_(busy|reset|status))?|convert|copy_(from|to)|dbname|delete|end_copy|escape_bytea|escape_string|execute|fetch_(all(_columns)?|array|assoc|object|result|row)|field_(is_null|name|num|prtlen|size|table|type(_oid)?)|free_result|get_(notify|pid|result)|host|insert|last_(error|notice|oid)|lo_(close|create|(ex|im)port|open|read(_all)?|seek|tell|unlink|write)|meta_data|num_(fields|rows)|options|parameter_status|pconnect|ping|port|prepare|put_line|query(_params)?|result_(error(_field)?|seek|status)|select|send_(execute|prepare|query(_params)?)|set_(client_encoding|error_verbosity)|trace|transaction_status|tty|unescape_bytea|untrace|update|version)|php(credits|info|version|_(check_syntax|ini_(loaded_file|scanned_files)|logo_guid|sapi_name|strip_whitespace|uname))|pi|png2wbmp|popen|pos(ix_(access|ctermid|get(cwd|(eg|eu|g|grg|pg|p|pp|pwu|s|u)id|grnam|groups|login|pgrp|pwnam|rlimit|_last_error)|initgroups|isatty|kill|mk(fifo|nod)|set(eg|eu|g|pg|s|u)id|strerror|times|(tty|u)name))?|pow|preg_(filter|grep|last_error|match(_all)?|quote|replace(_callback)?|split)|prev|print(f|_r)?|printer_(abort|close|(create|delete)_(brush|dc|font|pen)|draw_(bmp|chord|elipse|line|pie|rectangle|roundrect|text)|(end|start)_(doc|page)|get_option|list|logical_fontheight|open|select_(brush|font|pen)|set_option|write)|proc_(close|get_status|nice|open|terminate)|property_exists|ps_(add_(bookmark|(launch|local|pdf|web)link|note)|arc(n)?|begin_(page|pattern|template)|circle|clip|close(path(_stroke)?|_image)?|continue_text|curveto|delete|end_(page|pattern|template)|fill(_stroke)?|findfont|get_(buffer|parameter|value)|hyphenate|include_file|lineto|makespotcolor|moveto|new|open_(file|image(_file)?|memory_image)|place_image|rect|restore|rotate|save|scale|set(color|dash|flat|font|gray|line(cap|join|width)|miterlimit|overprintmode|polydash|_(border_(color|dash|style)|info|parameter|text_pos|value))|shading(_pattern)?|shfill|show(2|_(boxed|xy(2)?))?|string(width|_geometry)|stroke|symbol(_(name|width))?|translate)|pspell_(add_to_(personal|session)|check|clear_session|config_(create|(data|dict)_dir|ignore|mode|personal|repl|runtogether|save_repl)|new(_(config|personal))?|save_wordlist|store_replacement|suggest)|putenv|px_(close|(create|open)_fp|date2string|delete(_record)?|get_(field|info|parameter|record|schema|value)|(insert|put|retrieve)_record|new|num(fields|records)|set_(blob_file|parameter|tablename|targetencoding|value)|timestamp2string|update_record)|qdom_(error|tree)|quoted_printable_(de|en)code|quotemeta|rad2deg|radius_(acct_open|add_server|auth_open|close|config|create_request|cvt_(addr|int|string)|demangle(_mppe_key)?|get_(vendor_)?attr|put_(vendor_)?(addr|attr|int|string)|request_authenticator|send_request|server_secret|strerror)|rand|range|rar_(close|entry_get|list|open)|rawurl(de|en)code|read(dir|(gz)?file|line(_(add_history|callback_(handler_(install|remove)|read_char)|clear_history|completion_function|info|list_history|on_new_line|(read|write)_history|redisplay))?|link|_exif_data)|realpath|recode(_(file|string))?|register_(shutdown|tick)_function|rename(_function)?|require(_once)?|reset|restore_((error|exception)_handler|include_path)|return|rewind(dir)?|rmdir|round|rpm_(close|get_tag|is_valid|open|version)|rsort|rtrim|runkit_(class_(adopt|emancipate)|constant_(add|redefine|remove)|(function|method)_(add|copy|redefine|remove|rename)|import|lint(_file)?|return_value_used|sandbox_output_handler|superglobals))\b/g,
-		    css: 'php-function functions' },
-
-		// functions s
-		{ regex: /\b(?:scandir|sem_(acquire|get|release|remove)|serialize|session_(cache_(expire|limiter)|commit|(de|en)code|destroy|get_cookie_params|id|is_registered|(module_)?name|pgsql_((add|get)_error|(g|s)et_field|reset|status)|regenerate_id|(un)?register|save_path|set_(cookie_params|save_handler)|start|unset|write_close)|set((raw)?cookie|locale|type|_((error|exception)_handler|file_buffer|include_path|magic_quotes_runtime|time_limit))|sha1(_file)?|shell_exec|shm_(attach|detach|(get|put)_var|remove(_var)?)|shmop_(close|delete|open|read|size|write)|show_source|shuffle|signeurlpaiement|similar_text|simplexml_(import_dom|load_(file|string))|sin(h)?|sizeof|sleep|snmp(get(next)?|realwalk|set|walk(oid)?|_(get_(quick_print|valueretrieval)|read_mib|set_(enum_print|oid_(numeric_print|output_format)|quick_print|valueretrieval)))|socket_(accept|bind|clear_error|close|connect|create(_(listen|pair))?|get((peer|sock)name|_(option|status))|last_error|listen|read|recv(from)?|select|send(to)?|set_(block(ing)?|nonblock|option|timeout)|shutdown|strerror|write)|sort|soundex|spl(bool|doublylinkedlist|enum|fileinfo|fixedarray|float|(max|min)?heap|int|it(i)?|objectstorage|(priority)?queue|stack|string|_(autoload(_(call|extensions|functions|(un)?register))?|classes|object_hash))|sprintf|sql_regcase|sqlite_(array_query|busy_timeout|changes|close|column|create_(aggregate|function)|current|(error|escape)_string|exec|factory|fetch_(all|array|column_types|object|single|string)|field_name|has_(more|prev)|key|last_(error|insert_rowid)|lib(encoding|version)|next|num_(fields|rows)|(p)?open|prev|((single|unbuffered)_)?query|rewind|seek|udf_(de|en)code_binary|valid)|sqrt|srand|sscanf|ssh2_(auth_(hostbased_file|none|password|pubkey_file)|connect|exec|fetch_stream|fingerprint|methods_negotiated|publickey_(add|init|list|remove)|scp_(recv|send)|sftp(_(lstat|(mk|rm)dir|(read|sym|un)link|realpath|rename|stat))?|shell|tunnel)|stat|stats_(absolute_deviation|cdf_(beta|(negative_)?binomial|cauchy|chisquare|exponential|f|gamma|laplace|logistic|noncentral_(chisquare|f)|poisson|t|uniform|weibull)|covariance|den_uniform|dens_(beta|cauchy|chisquare|exponential|f|gamma|laplace|logistic|negative_binomial|normal|pmf_(binomial|hypergeometric|poisson)|t|weibull)|harmonic_mean|kurtosis|rand_(gen_(beta|chisquare|exponential|f|funiform|gamma|ibinomial(_negative)?|int|ipoisson|iuniform|noncenral_chisquare|noncentral_(f|t)|normal|t)|get_seeds|phrase_to_seeds|ranf|setall)|skew|standard_deviation|stat_(binomial_coef|correlation|gennch|independent_t|innerproduct|noncentral_t|paired_t|percentile|powersum)|variance)|str(casecmp|chr|cmp|coll|cspn|_(getcsv|(i)?replace|pad|repeat|rot13|shuffle|split|word_count))|stream(wrapper|_(bucket_(append|make_writeable|new|prepend)|context_(create|get_(default|options|params)|set_(default|option|params))|copy_to_stream|encoding|filter_(append|prepend|register|remove)|get_(contents|filters|line|meta_data|transports|wrappers)|is_local|notification_callback|register_wrapper|resolve_include_path|select|set_(blocking|timeout|write_buffer)|socket_(accept|client|enable_crypto|get_name|pair|recvfrom|sendto|server|shutdown)|supports_lock|wrapper_((un)?register|restore)))|strftime|strip((c)?slashes|os|_tags)|str((i)?str|len|n(at)?(case)?cmp|pbrk|pos|ptime|rchr|rev|ripos|rpos|spn|to(k|lower|time|upper)|tr|val)|substr(_(compare|count|replace))?|svn_(add|auth_(g|s)et_parameter|blame|cat|checkout|cleanup|client_version|commit|diff|export|fs_(abort_txn|apply_text|begin_txn2|change_node_prop|check_path|contents_changed|copy|delete|dir_entries|file_(contents|length)|(is|make)_(dir|file)|node_(created_rev|prop)|props_changed|revision_(prop|root)|txn_root|youngest_rev)|import|log|ls|mkdir|repos_(create|fs(_(begin_txn_for_commit|commit_txn))?|hotcopy|open|recover)|revert|status|update)|swf_(action(geturl|goto(frame|label)|(next|prev)frame|play|settarget|stop|togglequality|waitforframe)|add(buttonrecord|color)|closefile|define(bitmap|font|line|poly|rect|text)|end(button|doaction|shape|symbol)|font(size|slant|tracking)|get((bitmap|font)info|frame)|labelframe|lookat|modifyobject|mulcolor|nextid|oncondition|openfile|ortho(2)?|perspective|placeobject|polarview|popmatrix|posround|pushmatrix|removeobject|rotate|scale|set(font|frame)|shape(arc|curveto(3)?|fill(bitmap(clip|tile)|off|solid)|line(solid|to)|moveto)|showframe|start(button|doaction|shape|symbol)|textwidth|translate|viewport)|swish(result(s_(get(parsed|removedstop)words|(next|seek)result)|_(getmetalist|stem))|_(construct|get(meta|property)list|prepare|query)|search_(execute|resetlimit|set(limit|phrasedelimiter|sort|structure)))|sybase_(affected_rows|close|connect|data_seek|deadlock_retry_count|fetch_(array|assoc|field|object|row)|field_seek|free_result|get_last_message|min_(client|error|message|server)_severity|num_(fields|rows)|pconnect|query|result|select_db|set_message_handler|unbuffered_query)|symlink|sys_get(loadavg|_temp_dir)|sys(tem|log))\b/g,
-		    css: 'php-function functions' },
-
-		// functions t-z
-		{ regex: /\b(?:tan(h)?|tcpwrap_check|tempnam|textdomain|tidy(node|_((access|config|error)_count|diagnose|get_(error_buffer|output)|(load|reset|save)_config|set(opt|_encoding)|warning_count))?|time(zone_((abbreviations|identifiers)_list|(location|offset|transitions|version)_get|name_(from_abbr|get)|open)|_(nanosleep|sleep_until))?|tmpfile|token_(get_all|name)|touch|traversable|trigger_error|trim|uasort|ucfirst|ucwords|udm_(add_search_limit|alloc_agent(_array)?|api_version|cat_(list|path)|check_(charset|stored)|clear_search_limits|close_stored|crc32|err(or|no)|find|free_(agent|ispell_data|res)|get_(doc_count|res_(field|param))|hash32|load_ispell_data|open_stored|set_agent_param)|uksort|umask|(underflow|unexpectedvalue)exception|unicode_((de|en)code|(g|s)et_(error_mode|subst_char))|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|url(de|en)code|use_soap_error_handler|user_error|usleep|usort|utf8_(de|en)code|var_(dump|export)|variant_(abs|add|and|cast|cat|cmp|date_(from|to)_timestamp|div|eqv|fix|get_type|idiv|imp|int|mod|mul|neg|not|or|pow|round|set(_type)?|sub|xor)|version_compare|vfprintf|virtual|vpopmail_(add_((alias_)?domain(_ex)?|user)|alias_(add|del(_domain)?|get(_all)?)|auth_user|del_(domain(_ex)?|user)|error|passwd|set_user_quota)|v(s)?printf|w32api_((def|init_d)type|(invoke|register)_function|set_call_method)|wddx_(add_vars|deserialize|packet_(end|start)|serialize_(value|vars)|unserialize)|win32_((create|delete)_service|get_last_control_message|ps_(list_procs|stat_(mem|proc))|(query|set)_service_status|start_service(_ctrl_dispatcher)?|stop_service)|wordwrap|xattr_(get|list|remove|set|supported)|xdiff_((file|string)_(bdiff(_size)?|bpatch|(diff|patch)(_binary)?|merge3|rabdiff))|xml_(error_string|get_(current_(byte_index|(column|line)_number)|error_code)|parse(r_(create(_ns)?|free|(g|s)et_option)|_into_struct)?|set_((character_data|default|element|(end_namespace|notation|start_namespace|unparsed_entity)_decl|external_entity_ref|processing_instruction)_handler|object))|xmlrpc_((de|en)code(_request)?|get_type|is_fault|parse_method_descriptions|server_(add_introspection_data|call_method|create|destroy|register_(introspection_callback|method))|set_type)|xpath_(eval(_expression)?|new_context|register_ns(_auto)?)|xptr_(eval|new_context)|xslt_(backend_(info|name|version)|create|err(or|no)|free|getopt|process|set_(base|encoding|error_handler|log|object|(sax|scheme)_handler(s)?)|setopt)|yaz_(addinfo|ccl_(conf|parse)|close|connect|database|element|err(or|no)|es(_result)?|(g|s)et_option|hits|itemorder|present|range|record|scan(_result)?|schema|search|sort|syntax|wait)|yp_(all|cat|err(no|_string)|first|get_default_domain|master|match|next|order)|zend_(logo_guid|thread_id|version)|zip_(close|entry_(close|compress(edsize|ionmethod)|filesize|name|open|read)|open|read)|zlib_get_coding_type)\b/g,
-		    css: 'php-function functions' },
-
-		{ regex: /\w+(?=\()/g,
-		    css: 'php-custfunc functions' }
-	];
-
-	this.forHtmlScript({
-		left: /(&lt;|<)\?(php|=)?/gi,
-		right: /\?(&gt;|>)/gi
-	});
-};
-
-SyntaxHighlighter.brushes.Php.prototype = new SyntaxHighlighter.Highlighter();
-SyntaxHighlighter.brushes.Php.aliases = ['php'];
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushPowerShell.js b/vendor/assets/javascripts/sh/brushes/shBrushPowerShell.js
deleted file mode 100644
index 0be17529..00000000
--- a/vendor/assets/javascripts/sh/brushes/shBrushPowerShell.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * SyntaxHighlighter
- * http://alexgorbatchev.com/SyntaxHighlighter
- *
- * SyntaxHighlighter is donationware. If you are using it, please donate.
- * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
- *
- * @version
- * 3.0.83 (July 02 2010)
- * 
- * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
- *
- * @license
- * Dual licensed under the MIT and GPL licenses.
- */
-;(function()
-{
-	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
-
-	function Brush()
-	{
-		// Contributes by B.v.Zanten, Getronics
-		// http://confluence.atlassian.com/display/CONFEXT/New+Code+Macro
-
-		var keywords = 'Add-Content Add-History Add-Member Add-PSSnapin Clear(-Content)? Clear-Item ' +
-					'Clear-ItemProperty Clear-Variable Compare-Object ConvertFrom-SecureString Convert-Path ' +
-					'ConvertTo-Html ConvertTo-SecureString Copy(-Item)? Copy-ItemProperty Export-Alias ' +
-					'Export-Clixml Export-Console Export-Csv ForEach(-Object)? Format-Custom Format-List ' +
-					'Format-Table Format-Wide Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command ' +
-					'Get-Content Get-Credential Get-Culture Get-Date Get-EventLog Get-ExecutionPolicy ' +
-					'Get-Help Get-History Get-Host Get-Item Get-ItemProperty Get-Location Get-Member ' +
-					'Get-PfxCertificate Get-Process Get-PSDrive Get-PSProvider Get-PSSnapin Get-Service ' +
-					'Get-TraceSource Get-UICulture Get-Unique Get-Variable Get-WmiObject Group-Object ' +
-					'Import-Alias Import-Clixml Import-Csv Invoke-Expression Invoke-History Invoke-Item ' +
-					'Join-Path Measure-Command Measure-Object Move(-Item)? Move-ItemProperty New-Alias ' +
-					'New-Item New-ItemProperty New-Object New-PSDrive New-Service New-TimeSpan ' +
-					'New-Variable Out-Default Out-File Out-Host Out-Null Out-Printer Out-String Pop-Location ' +
-					'Push-Location Read-Host Remove-Item Remove-ItemProperty Remove-PSDrive Remove-PSSnapin ' +
-					'Remove-Variable Rename-Item Rename-ItemProperty Resolve-Path Restart-Service Resume-Service ' +
-					'Select-Object Select-String Set-Acl Set-Alias Set-AuthenticodeSignature Set-Content ' +
-					'Set-Date Set-ExecutionPolicy Set-Item Set-ItemProperty Set-Location Set-PSDebug ' +
-					'Set-Service Set-TraceSource Set(-Variable)? Sort-Object Split-Path Start-Service ' +
-					'Start-Sleep Start-Transcript Stop-Process Stop-Service Stop-Transcript Suspend-Service ' +
-					'Tee-Object Test-Path Trace-Command Update-FormatData Update-TypeData Where(-Object)? ' +
-					'Write-Debug Write-Error Write(-Host)? Write-Output Write-Progress Write-Verbose Write-Warning';
-		var alias = 'ac asnp clc cli clp clv cpi cpp cvpa diff epal epcsv fc fl ' +
-					'ft fw gal gc gci gcm gdr ghy gi gl gm gp gps group gsv ' +
-					'gsnp gu gv gwmi iex ihy ii ipal ipcsv mi mp nal ndr ni nv oh rdr ' +
-					'ri rni rnp rp rsnp rv rvpa sal sasv sc select si sl sleep sort sp ' +
-					'spps spsv sv tee cat cd cp h history kill lp ls ' +
-					'mount mv popd ps pushd pwd r rm rmdir echo cls chdir del dir ' +
-					'erase rd ren type % \\?';
-
-		this.regexList = [
-			{ regex: /#.*$/gm,										css: 'comments' },  // one line comments
-			{ regex: /\$[a-zA-Z0-9]+\b/g,							css: 'value'   },   // variables $Computer1
-			{ regex: /\-[a-zA-Z]+\b/g,								css: 'keyword' },   // Operators    -not  -and  -eq
-			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,	css: 'string' },    // strings
-			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,	css: 'string' },    // strings
-			{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),	css: 'keyword' },
-			{ regex: new RegExp(this.getKeywords(alias), 'gmi'),	css: 'keyword' }
-		];
-	};
-
-	Brush.prototype	= new SyntaxHighlighter.Highlighter();
-	Brush.aliases	= ['powershell', 'ps'];
-
-	SyntaxHighlighter.brushes.PowerShell = Brush;
-
-	// CommonJS
-	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
-})();
diff --git a/vendor/assets/javascripts/sh/manifest.js b/vendor/assets/javascripts/sh/manifest.js
deleted file mode 100644
index cd61ab9c..00000000
--- a/vendor/assets/javascripts/sh/manifest.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// SyntaxHighlighter by Alex Gorbachev
-//
-//= require sh/XRegExp
-//= require sh/shCore
-//= require_tree ./brushes
diff --git a/vendor/assets/javascripts/sh/shAutoloader.js b/vendor/assets/javascripts/sh/shAutoloader.js
old mode 100644
new mode 100755
index 4e29bdde..33636c70
--- a/vendor/assets/javascripts/sh/shAutoloader.js
+++ b/vendor/assets/javascripts/sh/shAutoloader.js
@@ -6,12 +6,133 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
  */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(2(){1 h=5;h.I=2(){2 n(c,a){4(1 d=0;d<c.9;d++)i[c[d]]=a}2 o(c){1 a=r.H("J"),d=3;a.K=c;a.M="L/t";a.G="t";a.u=a.v=2(){6(!d&&(!8.7||8.7=="F"||8.7=="z")){d=q;e[c]=q;a:{4(1 p y e)6(e[p]==3)B a;j&&5.C(k)}a.u=a.v=x;a.D.O(a)}};r.N.R(a)}1 f=Q,l=h.P(),i={},e={},j=3,k=x,b;5.T=2(c){k=c;j=q};4(b=0;b<f.9;b++){1 m=f[b].w?f[b]:f[b].S(/\\s+/),g=m.w();n(m,g)}4(b=0;b<l.9;b++)6(g=i[l[b].E.A]){e[g]=3;o(g)}}})();',56,56,'|var|function|false|for|SyntaxHighlighter|if|readyState|this|length|||||||||||||||||true|document||javascript|onload|onreadystatechange|pop|null|in|complete|brush|break|highlight|parentNode|params|loaded|language|createElement|autoloader|script|src|text|type|body|removeChild|findElements|arguments|appendChild|split|all'.split('|'),0,{}))
+(function() {
+
+var sh = SyntaxHighlighter;
+
+/**
+ * Provides functionality to dynamically load only the brushes that a needed to render the current page.
+ *
+ * There are two syntaxes that autoload understands. For example:
+ *
+ * SyntaxHighlighter.autoloader(
+ *     [ 'applescript',          'Scripts/shBrushAppleScript.js' ],
+ *     [ 'actionscript3', 'as3', 'Scripts/shBrushAS3.js' ]
+ * );
+ *
+ * or a more easily comprehendable one:
+ *
+ * SyntaxHighlighter.autoloader(
+ *     'applescript       Scripts/shBrushAppleScript.js',
+ *     'actionscript3 as3 Scripts/shBrushAS3.js'
+ * );
+ */
+sh.autoloader = function()
+{
+	var list = arguments,
+		elements = sh.findElements(),
+		brushes = {},
+		scripts = {},
+		all = SyntaxHighlighter.all,
+		allCalled = false,
+		allParams = null,
+		i
+		;
+
+	SyntaxHighlighter.all = function(params)
+	{
+		allParams = params;
+		allCalled = true;
+	};
+
+	function addBrush(aliases, url)
+	{
+		for (var i = 0; i < aliases.length; i++)
+			brushes[aliases[i]] = url;
+	};
+
+	function getAliases(item)
+	{
+		return item.pop
+			? item
+			: item.split(/\s+/)
+			;
+	}
+
+	// create table of aliases and script urls
+	for (i = 0; i < list.length; i++)
+	{
+		var aliases = getAliases(list[i]),
+			url = aliases.pop()
+			;
+
+		addBrush(aliases, url);
+	}
+
+	// dynamically add <script /> tags to the document body
+	for (i = 0; i < elements.length; i++)
+	{
+		var url = brushes[elements[i].params.brush];
+
+		if(url && scripts[url] === undefined)
+		{
+			if(elements[i].params['html-script'] === 'true')
+			{
+				if(scripts[brushes['xml']] === undefined) {
+					loadScript(brushes['xml']);
+					scripts[url] = false;
+				}
+			}
+
+			scripts[url] = false;
+			loadScript(url);
+		}
+	}
+
+	function loadScript(url)
+	{
+		var script = document.createElement('script'),
+			done = false
+			;
+
+		script.src = url;
+		script.type = 'text/javascript';
+		script.language = 'javascript';
+		script.onload = script.onreadystatechange = function()
+		{
+			if (!done && (!this.readyState || this.readyState == 'loaded' || this.readyState == 'complete'))
+			{
+				done = true;
+				scripts[url] = true;
+				checkAll();
+
+				// Handle memory leak in IE
+				script.onload = script.onreadystatechange = null;
+				script.parentNode.removeChild(script);
+			}
+		};
+
+		// sync way of adding script tags to the page
+		document.body.appendChild(script);
+	};
+
+	function checkAll()
+	{
+		for(var url in scripts)
+			if (scripts[url] == false)
+				return;
+
+		if (allCalled)
+			SyntaxHighlighter.highlight(allParams);
+	};
+};
+
+})();
diff --git a/vendor/assets/javascripts/sh/shBrushAS3.js b/vendor/assets/javascripts/sh/shBrushAS3.js
new file mode 100755
index 00000000..244df596
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushAS3.js
@@ -0,0 +1,59 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+	// CommonJS
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
+
+	function Brush()
+	{
+		// Created by Peter Atoria @ http://iAtoria.com
+	
+		var inits 	 =  'class interface function package';
+	
+		var keywords =	'-Infinity ...rest Array as AS3 Boolean break case catch const continue Date decodeURI ' + 
+						'decodeURIComponent default delete do dynamic each else encodeURI encodeURIComponent escape ' + 
+						'extends false final finally flash_proxy for get if implements import in include Infinity ' + 
+						'instanceof int internal is isFinite isNaN isXMLName label namespace NaN native new null ' + 
+						'Null Number Object object_proxy override parseFloat parseInt private protected public ' + 
+						'return set static String super switch this throw true try typeof uint undefined unescape ' + 
+						'use void while with'
+						;
+	
+		this.regexList = [
+			{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },		// one line comments
+			{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },		// multiline comments
+			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },		// double quoted strings
+			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },		// single quoted strings
+			{ regex: /\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi,				css: 'value' },			// numbers
+			{ regex: new RegExp(this.getKeywords(inits), 'gm'),			css: 'color3' },		// initializations
+			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' },		// keywords
+			{ regex: new RegExp('var', 'gm'),							css: 'variable' },		// variable
+			{ regex: new RegExp('trace', 'gm'),							css: 'color1' }			// trace
+			];
+	
+		this.forHtmlScript(SyntaxHighlighter.regexLib.scriptScriptTags);
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['actionscript3', 'as3'];
+
+	SyntaxHighlighter.brushes.AS3 = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/vendor/assets/javascripts/sh/shBrushAppleScript.js b/vendor/assets/javascripts/sh/shBrushAppleScript.js
new file mode 100755
index 00000000..910590c8
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushAppleScript.js
@@ -0,0 +1,100 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+	// CommonJS
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
+
+	function Brush()
+	{
+		// AppleScript brush by David Chambers
+		// http://davidchambersdesign.com/
+		var keywords   = 'after before beginning continue copy each end every from return get global in local named of set some that the then times to where whose with without';
+		var ordinals   = 'first second third fourth fifth sixth seventh eighth ninth tenth last front back middle';
+		var specials   = 'activate add alias ask attachment boolean class constant delete duplicate empty exists id integer list make message modal modified new no pi properties quit real record remove rest result reveal reverse run running save string word yes';
+
+		this.regexList = [
+
+			{ regex: /(--|#).*$/gm,
+			    css: 'comments' },
+
+			{ regex: /\(\*(?:[\s\S]*?\(\*[\s\S]*?\*\))*[\s\S]*?\*\)/gm, // support nested comments
+			    css: 'comments' },
+
+			{ regex: /"[\s\S]*?"/gm,
+			    css: 'string' },
+
+			{ regex: /(?:,|:|¬|'s\b|\(|\)|\{|\}|«|\b\w*»)/g, // operators
+			    css: 'color1' },
+
+			{ regex: /(-)?(\d)+(\.(\d)?)?(E\+(\d)+)?/g, // numbers
+			    css: 'color1' },
+
+			{ regex: /(?:&(amp;|gt;|lt;)?|=|� |>|<|≥|>=|≤|<=|\*|\+|-|\/|÷|\^)/g,
+			    css: 'color2' },
+
+			{ regex: /\b(?:and|as|div|mod|not|or|return(?!\s&)(ing)?|equals|(is(n't| not)? )?equal( to)?|does(n't| not) equal|(is(n't| not)? )?(greater|less) than( or equal( to)?)?|(comes|does(n't| not) come) (after|before)|is(n't| not)?( in)? (back|front) of|is(n't| not)? behind|is(n't| not)?( (in|contained by))?|does(n't| not) contain|contain(s)?|(start|begin|end)(s)? with|((but|end) )?(consider|ignor)ing|prop(erty)?|(a )?ref(erence)?( to)?|repeat (until|while|with)|((end|exit) )?repeat|((else|end) )?if|else|(end )?(script|tell|try)|(on )?error|(put )?into|(of )?(it|me)|its|my|with (timeout( of)?|transaction)|end (timeout|transaction))\b/g,
+			    css: 'keyword' },
+
+			{ regex: /\b\d+(st|nd|rd|th)\b/g, // ordinals
+			    css: 'keyword' },
+
+			{ regex: /\b(?:about|above|against|around|at|below|beneath|beside|between|by|(apart|aside) from|(instead|out) of|into|on(to)?|over|since|thr(ough|u)|under)\b/g,
+			    css: 'color3' },
+
+			{ regex: /\b(?:adding folder items to|after receiving|clipboard info|set the clipboard to|(the )?clipboard|entire contents|document( (edited|file|nib name))?|file( (name|type))?|(info )?for|giving up after|(name )?extension|return(ed)?|second(?! item)(s)?|list (disks|folder)|(Unicode )?text|(disk )?item(s)?|((current|list) )?view|((container|key) )?window|case|diacriticals|hyphens|numeric strings|punctuation|white space|folder creation|application(s( folder)?| (processes|scripts position|support))?|((desktop )?(pictures )?|(documents|downloads|favorites|home|keychain|library|movies|music|public|scripts|sites|system|users|utilities|workflows) )folder|desktop|Folder Action scripts|font(s| panel)?|help|internet plugins|modem scripts|(system )?preferences|printer descriptions|scripting (additions|components)|shared (documents|libraries)|startup (disk|items)|temporary items|trash|on server|in AppleTalk zone|((as|long|short) )?user name|user (ID|locale)|(with )?password|in (bundle( with identifier)?|directory)|(close|open for) access|read|write( permission)?|(g|s)et eof|starting at|hidden( answer)?|open(ed| (location|untitled))?|error (handling|reporting)|administrator privileges|altering line endings|get volume settings|(alert|boot|input|mount|output|set) volume|output muted|(fax|random )?number|round(ing)?|up|down|toward zero|to nearest|as taught in school|system (attribute|info)|((AppleScript( Studio)?|system) )?version|(home )?directory|(IPv4|primary Ethernet) address|CPU (type|speed)|physical memory|time (stamp|to GMT)|replacing|ASCII (character|number)|localized string|from table|offset|summarize|beep|delay|say|(empty|multiple) selections allowed|(of|preferred) type|invisibles|showing( package contents)?|editable URL|(File|FTP|News|Media|Web) [Ss]ervers|Telnet hosts|Directory services|Remote applications|waiting until completion|saving( (in|to))?|path (for|to( (((current|frontmost) )?application|resource))?)|(background|RGB) color|(OK|cancel) button name|cancel button|button(s)?|cubic ((centi)?met(re|er)s|yards|feet|inches)|square ((kilo)?met(re|er)s|miles|yards|feet)|(centi|kilo)?met(re|er)s|miles|yards|feet|inches|lit(re|er)s|gallons|quarts|(kilo)?grams|ounces|pounds|degrees (Celsius|Fahrenheit|Kelvin)|print( (dialog|settings))?|clos(e(able)?|ing)|(de)?miniaturized|miniaturizable|zoom(ed|able)|attribute run|action (method|property|title)|phone|email|((start|end)ing|home) page|((birth|creation|current|custom|modification) )?date|((((phonetic )?(first|last|middle))|computer|host|maiden|related) |nick)?name|aim|icq|jabber|msn|yahoo|address(es)?|save addressbook|should enable action|city|country( code)?|formatte(r|d address)|(palette )?label|state|street|zip|AIM [Hh]andle(s)?|my card|select(ion| all)?|unsaved|(alpha )?value|entr(y|ies)|(ICQ|Jabber|MSN) handle|person|people|company|department|icon image|job title|note|organization|suffix|vcard|url|copies|collating|pages (across|down)|request print time|target( printer)?|((GUI Scripting|Script menu) )?enabled|show Computer scripts|(de)?activated|awake from nib|became (key|main)|call method|of (class|object)|center|clicked toolbar item|closed|for document|exposed|(can )?hide|idle|keyboard (down|up)|event( (number|type))?|launch(ed)?|load (image|movie|nib|sound)|owner|log|mouse (down|dragged|entered|exited|moved|up)|move|column|localization|resource|script|register|drag (info|types)|resigned (active|key|main)|resiz(e(d)?|able)|right mouse (down|dragged|up)|scroll wheel|(at )?index|should (close|open( untitled)?|quit( after last window closed)?|zoom)|((proposed|screen) )?bounds|show(n)?|behind|in front of|size (mode|to fit)|update(d| toolbar item)?|was (hidden|miniaturized)|will (become active|close|finish launching|hide|miniaturize|move|open|quit|(resign )?active|((maximum|minimum|proposed) )?size|show|zoom)|bundle|data source|movie|pasteboard|sound|tool(bar| tip)|(color|open|save) panel|coordinate system|frontmost|main( (bundle|menu|window))?|((services|(excluded from )?windows) )?menu|((executable|frameworks|resource|scripts|shared (frameworks|support)) )?path|(selected item )?identifier|data|content(s| view)?|character(s)?|click count|(command|control|option|shift) key down|context|delta (x|y|z)|key( code)?|location|pressure|unmodified characters|types|(first )?responder|playing|(allowed|selectable) identifiers|allows customization|(auto saves )?configuration|visible|image( name)?|menu form representation|tag|user(-| )defaults|associated file name|(auto|needs) display|current field editor|floating|has (resize indicator|shadow)|hides when deactivated|level|minimized (image|title)|opaque|position|release when closed|sheet|title(d)?)\b/g,
+			    css: 'color4' },
+
+			{ regex: /\b(?:tracks|paragraph|text item(s)?)\b/g,
+			    css: 'classes' },
+
+			{ regex: /\b(?:AppleScript|album|video kind|grouping|length|text item delimiters|quoted form|POSIX path(?= of))\b/g,
+			    css: 'properties' },
+
+			{ regex: /\b(?:run|exists|count)\b/g,
+			    css: 'commandNames' },
+
+			{ regex: /\b(?:POSIX (file|path))\b/g,
+			    css: 'additionClasses' },
+
+			{ regex: /\b(?:message|with (data|icon( (caution|note|stop))?|parameter(s)?|prompt|properties|seed|title)|regexp|string result|using( delimiters)?|default (answer|button|color|country code|entr(y|ies)|identifiers|items|name|location|script editor))\b/g,
+			    css: 'additionParameterNames' },
+
+			{ regex: /\b(?:display(ing| (alert|dialog|mode))?|choose( ((remote )?application|color|folder|from list|URL))?|(do( shell)?|load|run|store) script|re_compile|find text)\b/g,
+			    css: 'additionCommandNames' },
+
+			{ regex: /\b(?:xxx)\b/g,
+			    css: 'parameterNames' },
+
+			{ regex: /\b(?:true|false|none)\b/g,
+			    css: 'enumeratedValues' },
+
+
+			{ regex: new RegExp(this.getKeywords(specials), 'gm'), css: 'color3' },
+			{ regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' },
+			{ regex: new RegExp(this.getKeywords(ordinals), 'gm'), css: 'keyword' }
+		];
+	};
+
+	Brush.prototype = new SyntaxHighlighter.Highlighter();
+	Brush.aliases = ['applescript'];
+
+	SyntaxHighlighter.brushes.AppleScript = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushBash.js b/vendor/assets/javascripts/sh/shBrushBash.js
old mode 100644
new mode 100755
similarity index 54%
rename from vendor/assets/javascripts/sh/brushes/shBrushBash.js
rename to vendor/assets/javascripts/sh/shBrushBash.js
index 8c296969..d9395d92
--- a/vendor/assets/javascripts/sh/brushes/shBrushBash.js
+++ b/vendor/assets/javascripts/sh/shBrushBash.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,25 +17,40 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
-		var keywords =	'if fi then elif else for do done until while break continue case function return in eq ne ge le';
-		var commands =  'alias apropos awk basename bash bc bg builtin bzip2 cal cat cd cfdisk chgrp chmod chown chroot' +
-						'cksum clear cmp comm command cp cron crontab csplit cut date dc dd ddrescue declare df ' +
+		function hereDocProcess(match, regexInfo)
+		{
+			var constructor = SyntaxHighlighter.Match,
+				result = []
+				;
+			if (match.here_doc != null)
+				result.push(new constructor(match.here_doc, match.index + match[0].indexOf(match.here_doc), 'string'));
+
+			if (match.full_tag != null)
+				result.push(new constructor(match.full_tag, match.index, 'preprocessor'));
+
+			if (match.end_tag != null)
+				result.push(new constructor(match.end_tag, match.index + match[0].lastIndexOf(match.end_tag), 'preprocessor'));
+			return result;
+		}
+		var keywords =	'if fi then elif else for do done until while break continue case esac function return in eq ne ge le';
+		var commands =  'alias apropos awk basename base64 bash bc bg builtin bzip2 cal cat cd cfdisk chgrp chmod chown chroot' +
+						'cksum clear cmp comm command cp cron crontab crypt csplit cut date dc dd ddrescue declare df ' +
 						'diff diff3 dig dir dircolors dirname dirs du echo egrep eject enable env ethtool eval ' +
 						'exec exit expand export expr false fdformat fdisk fg fgrep file find fmt fold format ' +
-						'free fsck ftp gawk getopts grep groups gzip hash head history hostname id ifconfig ' +
+						'free fsck ftp gawk gcc gdb getconf getopts grep groups gzip hash head history hostname id ifconfig ' +
 						'import install join kill less let ln local locate logname logout look lpc lpr lprint ' +
 						'lprintd lprintq lprm ls lsof make man mkdir mkfifo mkisofs mknod more mount mtools ' +
-						'mv netstat nice nl nohup nslookup open op passwd paste pathchk ping popd pr printcap ' +
+						'mv nasm nc ndisasm netstat nice nl nohup nslookup objdump od open op passwd paste pathchk ping popd pr printcap ' +
 						'printenv printf ps pushd pwd quota quotacheck quotactl ram rcp read readonly renice ' +
 						'remsync rm rmdir rsync screen scp sdiff sed select seq set sftp shift shopt shutdown ' +
-						'sleep sort source split ssh strace su sudo sum symlink sync tail tar tee test time ' +
+						'sleep sort source split ssh strace strings su sudo sum symlink sync tail tar tee test time ' +
 						'times touch top traceroute trap tr true tsort tty type ulimit umask umount unalias ' +
 						'uname unexpand uniq units unset unshar useradd usermod users uuencode uudecode v vdir ' +
-						'vi watch wc whereis which who whoami Wget xargs yes'
+						'vi watch wc whereis which who whoami Wget xargs xxd yes chsh'
 						;
 
 		this.regexList = [
@@ -45,12 +60,13 @@
 			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,			css: 'string' },		// double quoted strings
 			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,			css: 'string' },		// single quoted strings
 			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),			css: 'keyword' },		// keywords
-			{ regex: new RegExp(this.getKeywords(commands), 'gm'),			css: 'functions' }		// commands
+			{ regex: new RegExp(this.getKeywords(commands), 'gm'),			css: 'functions' },		// commands
+			{ regex: new XRegExp("(?<full_tag>(&lt;|<){2}(?<tag>\\w+)) .*$(?<here_doc>[\\s\\S]*)(?<end_tag>^\\k<tag>$)",'gm'),	func: hereDocProcess }
 			];
 	}
 
 	Brush.prototype	= new SyntaxHighlighter.Highlighter();
-	Brush.aliases	= ['bash', 'shell'];
+	Brush.aliases	= ['bash', 'shell', 'sh'];
 
 	SyntaxHighlighter.brushes.Bash = Brush;
 
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushCSharp.js b/vendor/assets/javascripts/sh/shBrushCSharp.js
old mode 100644
new mode 100755
similarity index 83%
rename from vendor/assets/javascripts/sh/brushes/shBrushCSharp.js
rename to vendor/assets/javascripts/sh/shBrushCSharp.js
index 079214ef..d5fff6e5
--- a/vendor/assets/javascripts/sh/brushes/shBrushCSharp.js
+++ b/vendor/assets/javascripts/sh/shBrushCSharp.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,17 +17,18 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
-		var keywords =	'abstract as base bool break byte case catch char checked class const ' +
-						'continue decimal default delegate do double else enum event explicit ' +
+		var keywords =	'abstract as async await base bool break byte case catch char checked class const ' +
+						'continue decimal default delegate do double else enum event explicit volatile ' +
 						'extern false finally fixed float for foreach get goto if implicit in int ' +
 						'interface internal is lock long namespace new null object operator out ' +
 						'override params private protected public readonly ref return sbyte sealed set ' +
 						'short sizeof stackalloc static string struct switch this throw true try ' +
-						'typeof uint ulong unchecked unsafe ushort using virtual void while';
+						'typeof uint ulong unchecked unsafe ushort using virtual void while var ' +
+						'from group by into select let where orderby join on equals ascending descending';
 
 		function fixComments(match, regexInfo)
 		{
@@ -62,4 +63,3 @@
 	// CommonJS
 	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
 })();
-
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushColdFusion.js b/vendor/assets/javascripts/sh/shBrushColdFusion.js
old mode 100644
new mode 100755
similarity index 97%
rename from vendor/assets/javascripts/sh/brushes/shBrushColdFusion.js
rename to vendor/assets/javascripts/sh/shBrushColdFusion.js
index 627dbb9b..02a41ea5
--- a/vendor/assets/javascripts/sh/brushes/shBrushColdFusion.js
+++ b/vendor/assets/javascripts/sh/shBrushColdFusion.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushCpp.js b/vendor/assets/javascripts/sh/shBrushCpp.js
old mode 100644
new mode 100755
similarity index 85%
rename from vendor/assets/javascripts/sh/brushes/shBrushCpp.js
rename to vendor/assets/javascripts/sh/shBrushCpp.js
index 9f70d3ae..9cf13177
--- a/vendor/assets/javascripts/sh/brushes/shBrushCpp.js
+++ b/vendor/assets/javascripts/sh/shBrushCpp.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -39,7 +39,7 @@
 						'PUSHORT PVOID PWCHAR PWORD PWSTR SC_HANDLE SC_LOCK SERVICE_STATUS_HANDLE SHORT ' +
 						'SIZE_T SSIZE_T TBYTE TCHAR UCHAR UHALF_PTR UINT UINT_PTR UINT32 UINT64 ULONG ' +
 						'ULONGLONG ULONG_PTR ULONG32 ULONG64 USHORT USN VOID WCHAR WORD WPARAM WPARAM WPARAM ' +
-						'char bool short int __int32 __int64 __int8 __int16 long float double __wchar_t ' +
+						'char char16_t char32_t bool short int __int32 __int64 __int8 __int16 long float double __wchar_t ' +
 						'clock_t _complex _dev_t _diskfree_t div_t ldiv_t _exception _EXCEPTION_POINTERS ' +
 						'FILE _finddata_t _finddatai64_t _wfinddata_t _wfinddatai64_t __finddata64_t ' +
 						'__wfinddata64_t _FPIEEE_RECORD fpos_t _HEAPINFO _HFILE lconv intptr_t ' +
@@ -48,14 +48,14 @@
 						'time_t __time64_t _timeb __timeb64 tm uintptr_t _utimbuf ' +
 						'va_list wchar_t wctrans_t wctype_t wint_t signed';
 
-		var keywords =	'break case catch class const __finally __exception __try ' +
+		var keywords =	'alignas alignof auto break case catch class const constexpr decltype __finally __exception __try ' +
 						'const_cast continue private public protected __declspec ' +
 						'default delete deprecated dllexport dllimport do dynamic_cast ' +
 						'else enum explicit extern if for friend goto inline ' +
-						'mutable naked namespace new noinline noreturn nothrow ' +
-						'register reinterpret_cast return selectany ' +
-						'sizeof static static_cast struct switch template this ' +
-						'thread throw true false try typedef typeid typename union ' +
+						'mutable naked namespace new noinline noreturn nothrow noexcept nullptr ' +
+						'ref register reinterpret_cast return selectany ' +
+						'sizeof static static_cast static_assert struct switch template this ' +
+						'thread thread_local throw true false try typedef typeid typename union ' +
 						'using uuid virtual void volatile whcar_t while';
 					
 		var functions =	'assert isalnum isalpha iscntrl isdigit isgraph islower isprint' +
@@ -88,7 +88,7 @@
 	};
 
 	Brush.prototype	= new SyntaxHighlighter.Highlighter();
-	Brush.aliases	= ['cpp', 'c'];
+	Brush.aliases	= ['cpp', 'cc', 'c++', 'c', 'h', 'hpp', 'h++'];
 
 	SyntaxHighlighter.brushes.Cpp = Brush;
 
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushCss.js b/vendor/assets/javascripts/sh/shBrushCss.js
old mode 100644
new mode 100755
similarity index 96%
rename from vendor/assets/javascripts/sh/brushes/shBrushCss.js
rename to vendor/assets/javascripts/sh/shBrushCss.js
index 4297a9a6..a462a8c7
--- a/vendor/assets/javascripts/sh/brushes/shBrushCss.js
+++ b/vendor/assets/javascripts/sh/shBrushCss.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushDelphi.js b/vendor/assets/javascripts/sh/shBrushDelphi.js
old mode 100644
new mode 100755
similarity index 91%
rename from vendor/assets/javascripts/sh/brushes/shBrushDelphi.js
rename to vendor/assets/javascripts/sh/shBrushDelphi.js
index e1060d44..7be39c55
--- a/vendor/assets/javascripts/sh/brushes/shBrushDelphi.js
+++ b/vendor/assets/javascripts/sh/shBrushDelphi.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushDiff.js b/vendor/assets/javascripts/sh/shBrushDiff.js
old mode 100644
new mode 100755
similarity index 52%
rename from vendor/assets/javascripts/sh/brushes/shBrushDiff.js
rename to vendor/assets/javascripts/sh/shBrushDiff.js
index e9b14fc5..e6cee034
--- a/vendor/assets/javascripts/sh/brushes/shBrushDiff.js
+++ b/vendor/assets/javascripts/sh/shBrushDiff.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,17 +17,17 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
 		this.regexList = [
-			{ regex: /^\+\+\+.*$/gm,		css: 'color2' },
-			{ regex: /^\-\-\-.*$/gm,		css: 'color2' },
-			{ regex: /^\s.*$/gm,			css: 'color1' },
-			{ regex: /^@@.*@@$/gm,			css: 'variable' },
-			{ regex: /^\+[^\+]{1}.*$/gm,	css: 'string' },
-			{ regex: /^\-[^\-]{1}.*$/gm,	css: 'comments' }
+			{ regex: /^\+\+\+ .*$/gm,	css: 'color2' },	// new file
+			{ regex: /^\-\-\- .*$/gm,	css: 'color2' },	// old file
+			{ regex: /^\s.*$/gm,		css: 'color1' },	// unchanged
+			{ regex: /^@@.*@@.*$/gm,	css: 'variable' },	// location
+			{ regex: /^\+.*$/gm,		css: 'string' },	// additions
+			{ regex: /^\-.*$/gm,		css: 'color3' }		// deletions
 			];
 	};
 
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushErlang.js b/vendor/assets/javascripts/sh/shBrushErlang.js
old mode 100644
new mode 100755
similarity index 85%
rename from vendor/assets/javascripts/sh/brushes/shBrushErlang.js
rename to vendor/assets/javascripts/sh/shBrushErlang.js
index 6ba7d9da..08f799d1
--- a/vendor/assets/javascripts/sh/brushes/shBrushErlang.js
+++ b/vendor/assets/javascripts/sh/shBrushErlang.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -45,7 +45,7 @@
 	Brush.prototype	= new SyntaxHighlighter.Highlighter();
 	Brush.aliases	= ['erl', 'erlang'];
 
-	SyntaxHighlighter.brushes.Erland = Brush;
+	SyntaxHighlighter.brushes.Erlang = Brush;
 
 	// CommonJS
 	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushGit.js b/vendor/assets/javascripts/sh/shBrushGit.js
similarity index 100%
rename from vendor/assets/javascripts/sh/brushes/shBrushGit.js
rename to vendor/assets/javascripts/sh/shBrushGit.js
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushGroovy.js b/vendor/assets/javascripts/sh/shBrushGroovy.js
old mode 100644
new mode 100755
similarity index 93%
rename from vendor/assets/javascripts/sh/brushes/shBrushGroovy.js
rename to vendor/assets/javascripts/sh/shBrushGroovy.js
index 6ec5c185..1f44e1b0
--- a/vendor/assets/javascripts/sh/brushes/shBrushGroovy.js
+++ b/vendor/assets/javascripts/sh/shBrushGroovy.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/shBrushHaxe.js b/vendor/assets/javascripts/sh/shBrushHaxe.js
new file mode 100755
index 00000000..a0743172
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushHaxe.js
@@ -0,0 +1,80 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function ()
+{
+	// CommonJS
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
+
+	function Brush ()
+	{
+
+		var inits = 'class interface package macro enum typedef extends implements dynamic in for if while else do try switch case catch';
+
+		var keywords = 'return break continue new throw cast using import function public private inline static untyped callback true false null Int Float String Void Std Bool Dynamic Array Vector';
+
+		this.regexList = [
+			{ regex:SyntaxHighlighter.regexLib.singleLineCComments , css:'comments' },
+			// one line comments
+			{ regex:SyntaxHighlighter.regexLib.multiLineCComments , css:'comments' },
+			// multiline comments
+			{ regex:SyntaxHighlighter.regexLib.doubleQuotedString , css:'string' },
+			// double quoted strings
+			{ regex:SyntaxHighlighter.regexLib.singleQuotedString , css:'string' },
+			// single quoted strings
+			{ regex:/\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi , css:'value' },
+			// numbers
+			{ regex:new RegExp ( this.getKeywords ( inits ) , 'gm' ) , css:'color3' },
+			// initializations
+			{ regex:new RegExp ( this.getKeywords ( keywords ) , 'gm' ) , css:'keyword' },
+			// keywords
+			{ regex:new RegExp ( 'var' , 'gm' ) , css:'variable' },
+			// variable
+			{ regex:new RegExp ( 'trace' , 'gm' ) , css:'color1' },
+			//compiler conditionals
+			{ regex:new RegExp ( '#if' , 'gm' ) , css:'comments' },
+			{ regex:new RegExp ( '#elseif' , 'gm' ) , css:'comments' },
+			{ regex:new RegExp ( '#end' , 'gm' ) , css:'comments' },
+			{ regex:new RegExp ( '#error' , 'gm' ) , css:'comments' }
+		];
+
+		//standard compiler conditionals flags
+		var flags = [
+			"debug", "error", "cpp", "js", "neko", "php", "flash", "flash8", "flash9", "flash10", "flash10", "mobile", "desktop", "web", "ios", "android", "iphone"
+		];
+
+		//append the flags to the array with a ! operator
+		var i;
+		var length = flags.length;
+		for ( i = 0 ; i <= length - 1 ; i ++ )
+		{
+			this.regexList.push ( {regex:new RegExp ( flags[i] , 'gm' ) , css:'comments'} );
+			this.regexList.push ( {regex:new RegExp ( '!' + flags[i] , 'gm' ) , css:'comments'} );
+		}
+
+		this.forHtmlScript ( SyntaxHighlighter.regexLib.scriptScriptTags );
+	}
+
+	;
+
+	Brush.prototype = new SyntaxHighlighter.Highlighter ();
+	Brush.aliases = ['haxe', 'hx'];
+
+	SyntaxHighlighter.brushes.Haxe = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+}) ();
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushJScript.js b/vendor/assets/javascripts/sh/shBrushJScript.js
old mode 100644
new mode 100755
similarity index 67%
rename from vendor/assets/javascripts/sh/brushes/shBrushJScript.js
rename to vendor/assets/javascripts/sh/shBrushJScript.js
index ff98daba..3b7cbd15
--- a/vendor/assets/javascripts/sh/brushes/shBrushJScript.js
+++ b/vendor/assets/javascripts/sh/shBrushJScript.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,16 +17,16 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
-		var keywords =	'break case catch continue ' +
-						'default delete do else false  ' +
-						'for function if in instanceof ' +
-						'new null return super switch ' +
-						'this throw true try typeof var while with'
-						;
+		var keywords =	'break case catch class continue ' +
+				'default delete do else enum export extends false  ' +
+				'for function if implements import in instanceof ' +
+				'interface let new null package private protected ' +
+				'static return super switch ' +
+				'this throw true try typeof var while with yield';
 
 		var r = SyntaxHighlighter.regexLib;
 		
@@ -43,7 +43,7 @@
 	};
 
 	Brush.prototype	= new SyntaxHighlighter.Highlighter();
-	Brush.aliases	= ['js', 'jscript', 'javascript'];
+	Brush.aliases	= ['js', 'jscript', 'javascript', 'json'];
 
 	SyntaxHighlighter.brushes.JScript = Brush;
 
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushJava.js b/vendor/assets/javascripts/sh/shBrushJava.js
old mode 100644
new mode 100755
similarity index 86%
rename from vendor/assets/javascripts/sh/brushes/shBrushJava.js
rename to vendor/assets/javascripts/sh/shBrushJava.js
index d692fd63..6217d2bc
--- a/vendor/assets/javascripts/sh/brushes/shBrushJava.js
+++ b/vendor/assets/javascripts/sh/shBrushJava.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -31,7 +31,7 @@
 
 		this.regexList = [
 			{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },		// one line comments
-			{ regex: /\/\*([^\*][\s\S]*)?\*\//gm,						css: 'comments' },	 	// multiline comments
+			{ regex: /\/\*([^\*][\s\S]*?)?\*\//gm,						css: 'comments' },	 	// multiline comments
 			{ regex: /\/\*(?!\*\/)\*[\s\S]*?\*\//gm,					css: 'preprocessor' },	// documentation comments
 			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },		// strings
 			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },		// strings
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushJavaFX.js b/vendor/assets/javascripts/sh/shBrushJavaFX.js
old mode 100644
new mode 100755
similarity index 90%
rename from vendor/assets/javascripts/sh/brushes/shBrushJavaFX.js
rename to vendor/assets/javascripts/sh/shBrushJavaFX.js
index 1a150a6a..10b00f9e
--- a/vendor/assets/javascripts/sh/brushes/shBrushJavaFX.js
+++ b/vendor/assets/javascripts/sh/shBrushJavaFX.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/shBrushObjC.js b/vendor/assets/javascripts/sh/shBrushObjC.js
new file mode 100644
index 00000000..a280870c
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushObjC.js
@@ -0,0 +1,36 @@
+;(function() {
+
+	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+    
+    function Brush()	{
+
+        var datatypes = 'char bool BOOL double float int long short id void';
+        
+        var keywords = 'IBAction IBOutlet SEL YES NO readwrite readonly nonatomic NULL'
+                     + ' super self copy if else for in enum while typedef switch case return'
+                     + ' const static retain TRUE FALSE ON OFF';
+                
+        this.regexList = [
+                { regex: new RegExp(this.getKeywords(datatypes), 'gm'), css: 'color2' },        // primitive data types
+                { regex: new RegExp(this.getKeywords(keywords), 'gm'),  css: 'color2' },        // keywords
+                { regex: new RegExp('@\\w+\\b', 'g'),                   css: 'color2' },        // @-keywords
+                { regex: new RegExp('[: ]nil', 'g'),                    css: 'color2' },        // nil-workaround
+                { regex: new RegExp(' \\w+(?=[:\\]])', 'g'),            css: 'variable' },      // messages
+                { regex: SyntaxHighlighter.regexLib.singleLineCComments,css: 'comments' },      // comments
+                { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' },      // comments
+                { regex: new RegExp('@"[^"]*"', 'gm'),                  css: 'string' },        // strings
+                { regex: new RegExp('\\d', 'gm'),                       css: 'string' },        // numeric values
+                { regex: new RegExp('^ *#.*', 'gm'),                    css: 'preprocessor' },  // preprocessor
+                { regex: new RegExp('\\w+(?= \\*)', 'g'),               css: 'keyword' },       // object types - variable declaration
+                { regex: new RegExp('\\b[A-Z]\\w+\\b(?=[ ,;])', 'gm'),  css: 'keyword' },       // object types - protocol
+                { regex: new RegExp('\\.\\w+', 'g'),                    css: 'constants' }      // accessors
+        ];
+    };
+    Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['oc', 'obj-c'];
+
+	SyntaxHighlighter.brushes.ObjC = Brush;
+
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+
+})();
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushPerl.js b/vendor/assets/javascripts/sh/shBrushPerl.js
old mode 100644
new mode 100755
similarity index 62%
rename from vendor/assets/javascripts/sh/brushes/shBrushPerl.js
rename to vendor/assets/javascripts/sh/shBrushPerl.js
index d94a2e0e..715aa62d
--- a/vendor/assets/javascripts/sh/brushes/shBrushPerl.js
+++ b/vendor/assets/javascripts/sh/shBrushPerl.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -42,22 +42,46 @@
 			'shmwrite shutdown sin sleep socket socketpair sort splice split sprintf ' + 
 			'sqrt srand stat study substr symlink syscall sysopen sysread sysseek ' + 
 			'system syswrite tell telldir time times tr truncate uc ucfirst umask ' + 
-			'undef unlink unpack unshift utime values vec wait waitpid warn write';
+			'undef unlink unpack unshift utime values vec wait waitpid warn write ' +
+			// feature
+			'say';
     
 		var keywords =  
 			'bless caller continue dbmclose dbmopen die do dump else elsif eval exit ' +
 			'for foreach goto if import last local my next no our package redo ref ' + 
-			'require return sub tie tied unless untie until use wantarray while';
+			'require return sub tie tied unless untie until use wantarray while ' +
+			// feature
+			'given when default ' +
+			// Try::Tiny
+			'try catch finally ' +
+			// Moose
+			'has extends with before after around override augment';
     
 		this.regexList = [
-			{ regex: new RegExp('#[^!].*$', 'gm'),					css: 'comments' },
-			{ regex: new RegExp('^\\s*#!.*$', 'gm'),				css: 'preprocessor' }, // shebang
+			{ regex: /(<<|&lt;&lt;)((\w+)|(['"])(.+?)\4)[\s\S]+?\n\3\5\n/g,	css: 'string' },	// here doc (maybe html encoded)
+			{ regex: /#.*$/gm,										css: 'comments' },
+			{ regex: /^#!.*\n/g,									css: 'preprocessor' },	// shebang
+			{ regex: /-?\w+(?=\s*=(>|&gt;))/g,	css: 'string' }, // fat comma
+
+			// is this too much?
+			{ regex: /\bq[qwxr]?\([\s\S]*?\)/g,	css: 'string' }, // quote-like operators ()
+			{ regex: /\bq[qwxr]?\{[\s\S]*?\}/g,	css: 'string' }, // quote-like operators {}
+			{ regex: /\bq[qwxr]?\[[\s\S]*?\]/g,	css: 'string' }, // quote-like operators []
+			{ regex: /\bq[qwxr]?(<|&lt;)[\s\S]*?(>|&gt;)/g,	css: 'string' }, // quote-like operators <>
+			{ regex: /\bq[qwxr]?([^\w({<[])[\s\S]*?\1/g,	css: 'string' }, // quote-like operators non-paired
+
 			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,	css: 'string' },
 			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,	css: 'string' },
-			{ regex: new RegExp('(\\$|@|%)\\w+', 'g'),				css: 'variable' },
-			{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),	css: 'functions' },
+			// currently ignoring single quote package separator and utf8 names
+			{ regex: /(?:&amp;|[$@%*]|\$#)\$?[a-zA-Z_](\w+|::)*/g,   		css: 'variable' },
+			{ regex: /\b__(?:END|DATA)__\b[\s\S]*$/g,				css: 'comments' },
+
+			// don't capture the newline after =cut so that =cut\n\n=head1 will start a new pod section
+			{ regex: /(^|\n)=\w[\s\S]*?(\n=cut\s*(?=\n)|$)/g,		css: 'comments' },		// pod
+
+			{ regex: new RegExp(this.getKeywords(funcs), 'gm'),		css: 'functions' },
 			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),	css: 'keyword' }
-		    ];
+		];
 
 		this.forHtmlScript(SyntaxHighlighter.regexLib.phpScriptTags);
 	}
diff --git a/vendor/assets/javascripts/sh/shBrushPhp.js b/vendor/assets/javascripts/sh/shBrushPhp.js
new file mode 100755
index 00000000..8d9c2c4c
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushPhp.js
@@ -0,0 +1,88 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+	// CommonJS
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
+
+	function Brush()
+	{
+		var funcs	=	'abs acos acosh addcslashes addslashes ' +
+						'array_change_key_case array_chunk array_combine array_count_values array_diff '+
+						'array_diff_assoc array_diff_key array_diff_uassoc array_diff_ukey array_fill '+
+						'array_filter array_flip array_intersect array_intersect_assoc array_intersect_key '+
+						'array_intersect_uassoc array_intersect_ukey array_key_exists array_keys array_map '+
+						'array_merge array_merge_recursive array_multisort array_pad array_pop array_product '+
+						'array_push array_rand array_reduce array_reverse array_search array_shift '+
+						'array_slice array_splice array_sum array_udiff array_udiff_assoc '+
+						'array_udiff_uassoc array_uintersect array_uintersect_assoc '+
+						'array_uintersect_uassoc array_unique array_unshift array_values array_walk '+
+						'array_walk_recursive atan atan2 atanh base64_decode base64_encode base_convert '+
+						'basename bcadd bccomp bcdiv bcmod bcmul bindec bindtextdomain bzclose bzcompress '+
+						'bzdecompress bzerrno bzerror bzerrstr bzflush bzopen bzread bzwrite ceil chdir '+
+						'checkdate checkdnsrr chgrp chmod chop chown chr chroot chunk_split class_exists '+
+						'closedir closelog copy cos cosh count count_chars date decbin dechex decoct '+
+						'deg2rad delete ebcdic2ascii echo empty end ereg ereg_replace eregi eregi_replace error_log '+
+						'error_reporting escapeshellarg escapeshellcmd eval exec exit exp explode extension_loaded '+
+						'feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents '+
+						'fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype '+
+						'floatval flock floor flush fmod fnmatch fopen fpassthru fprintf fputcsv fputs fread fscanf '+
+						'fseek fsockopen fstat ftell ftok getallheaders getcwd getdate getenv gethostbyaddr gethostbyname '+
+						'gethostbynamel getimagesize getlastmod getmxrr getmygid getmyinode getmypid getmyuid getopt '+
+						'getprotobyname getprotobynumber getrandmax getrusage getservbyname getservbyport gettext '+
+						'gettimeofday gettype glob gmdate gmmktime ini_alter ini_get ini_get_all ini_restore ini_set '+
+						'interface_exists intval ip2long is_a is_array is_bool is_callable is_dir is_double '+
+						'is_executable is_file is_finite is_float is_infinite is_int is_integer is_link is_long '+
+						'is_nan is_null is_numeric is_object is_readable is_real is_resource is_scalar is_soap_fault '+
+						'is_string is_subclass_of is_uploaded_file is_writable is_writeable mkdir mktime nl2br '+
+						'parse_ini_file parse_str parse_url passthru pathinfo print readlink realpath rewind rewinddir rmdir '+
+						'round str_ireplace str_pad str_repeat str_replace str_rot13 str_shuffle str_split '+
+						'str_word_count strcasecmp strchr strcmp strcoll strcspn strftime strip_tags stripcslashes '+
+						'stripos stripslashes stristr strlen strnatcasecmp strnatcmp strncasecmp strncmp strpbrk '+
+						'strpos strptime strrchr strrev strripos strrpos strspn strstr strtok strtolower strtotime '+
+						'strtoupper strtr strval substr substr_compare';
+
+		var keywords =	'abstract and array as break case catch cfunction class clone const continue declare default die do ' +
+						'else elseif enddeclare endfor endforeach endif endswitch endwhile extends final finally for foreach ' +
+						'function global goto if implements include include_once interface instanceof insteadof namespace new ' +
+						'old_function or private protected public return require require_once static switch ' +
+						'trait throw try use var while xor yield ';
+		
+		var constants	= '__FILE__ __LINE__ __METHOD__ __FUNCTION__ __CLASS__';
+
+		this.regexList = [
+			{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },			// one line comments
+			{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
+			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// double quoted strings
+			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// single quoted strings
+			{ regex: /\$\w+/g,											css: 'variable' },			// variables
+			{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),		css: 'functions' },			// common functions
+			{ regex: new RegExp(this.getKeywords(constants), 'gmi'),	css: 'constants' },			// constants
+			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }			// keyword
+			];
+
+		this.forHtmlScript(SyntaxHighlighter.regexLib.phpScriptTags);
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['php'];
+
+	SyntaxHighlighter.brushes.Php = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushPlain.js b/vendor/assets/javascripts/sh/shBrushPlain.js
old mode 100644
new mode 100755
similarity index 73%
rename from vendor/assets/javascripts/sh/brushes/shBrushPlain.js
rename to vendor/assets/javascripts/sh/shBrushPlain.js
index 9f7d9e90..cd87cb92
--- a/vendor/assets/javascripts/sh/brushes/shBrushPlain.js
+++ b/vendor/assets/javascripts/sh/shBrushPlain.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/shBrushPowerShell.js b/vendor/assets/javascripts/sh/shBrushPowerShell.js
new file mode 100755
index 00000000..a8a7d761
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushPowerShell.js
@@ -0,0 +1,75 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+	// CommonJS
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
+
+	function Brush()
+	{
+		// Contributed by Joel 'Jaykul' Bennett, http://PoshCode.org | http://HuddledMasses.org
+		var keywords =	'while validateset validaterange validatepattern validatelength validatecount ' +
+						'until trap switch return ref process param parameter in if global: '+
+						'function foreach for finally filter end elseif else dynamicparam do default ' +
+						'continue cmdletbinding break begin alias \\? % #script #private #local #global '+
+						'mandatory parametersetname position valuefrompipeline ' +
+						'valuefrompipelinebypropertyname valuefromremainingarguments helpmessage ';
+
+		var operators =	' and as band bnot bor bxor casesensitive ccontains ceq cge cgt cle ' +
+						'clike clt cmatch cne cnotcontains cnotlike cnotmatch contains ' +
+						'creplace eq exact f file ge gt icontains ieq ige igt ile ilike ilt ' +
+						'imatch ine inotcontains inotlike inotmatch ireplace is isnot le like ' +
+						'lt match ne not notcontains notlike notmatch or regex replace wildcard';
+						
+		var verbs =		'write where wait use update unregister undo trace test tee take suspend ' +
+						'stop start split sort skip show set send select scroll resume restore ' +
+						'restart resolve resize reset rename remove register receive read push ' +
+						'pop ping out new move measure limit join invoke import group get format ' +
+						'foreach export expand exit enter enable disconnect disable debug cxnew ' +
+						'copy convertto convertfrom convert connect complete compare clear ' +
+						'checkpoint aggregate add';
+
+		// I can't find a way to match the comment based help in multi-line comments, because SH won't highlight in highlights, and javascript doesn't support lookbehind
+		var commenthelp = ' component description example externalhelp forwardhelpcategory forwardhelptargetname forwardhelptargetname functionality inputs link notes outputs parameter remotehelprunspace role synopsis';
+
+		this.regexList = [
+			{ regex: new RegExp('^\\s*#[#\\s]*\\.('+this.getKeywords(commenthelp)+').*$', 'gim'),			css: 'preprocessor help bold' },		// comment-based help
+			{ regex: SyntaxHighlighter.regexLib.singleLinePerlComments,										css: 'comments' },						// one line comments
+			{ regex: /(&lt;|<)#[\s\S]*?#(&gt;|>)/gm,														css: 'comments here' },					// multi-line comments
+			
+			{ regex: new RegExp('@"\\n[\\s\\S]*?\\n"@', 'gm'),												css: 'script string here' },			// double quoted here-strings
+			{ regex: new RegExp("@'\\n[\\s\\S]*?\\n'@", 'gm'),												css: 'script string single here' },		// single quoted here-strings
+			{ regex: new RegExp('"(?:\\$\\([^\\)]*\\)|[^"]|`"|"")*[^`]"','g'),								css: 'string' },						// double quoted strings
+			{ regex: new RegExp("'(?:[^']|'')*'", 'g'),														css: 'string single' },					// single quoted strings
+			
+			{ regex: new RegExp('[\\$|@|@@](?:(?:global|script|private|env):)?[A-Z0-9_]+', 'gi'),			css: 'variable' },						// $variables
+			{ regex: new RegExp('(?:\\b'+verbs.replace(/ /g, '\\b|\\b')+')-[a-zA-Z_][a-zA-Z0-9_]*', 'gmi'),	css: 'functions' },						// functions and cmdlets
+			{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),											css: 'keyword' },						// keywords
+			{ regex: new RegExp('-'+this.getKeywords(operators), 'gmi'),									css: 'operator value' },				// operators
+			{ regex: new RegExp('\\[[A-Z_\\[][A-Z0-9_. `,\\[\\]]*\\]', 'gi'),								css: 'constants' },						// .Net [Type]s
+			{ regex: new RegExp('\\s+-(?!'+this.getKeywords(operators)+')[a-zA-Z_][a-zA-Z0-9_]*', 'gmi'),	css: 'color1' },						// parameters	  
+		];
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['powershell', 'ps', 'posh'];
+
+	SyntaxHighlighter.brushes.PowerShell = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushPython.js b/vendor/assets/javascripts/sh/shBrushPython.js
old mode 100644
new mode 100755
similarity index 89%
rename from vendor/assets/javascripts/sh/brushes/shBrushPython.js
rename to vendor/assets/javascripts/sh/shBrushPython.js
index ce774629..d1e3e959
--- a/vendor/assets/javascripts/sh/brushes/shBrushPython.js
+++ b/vendor/assets/javascripts/sh/shBrushPython.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -25,7 +25,7 @@
 	
 		var keywords =  'and assert break class continue def del elif else ' +
 						'except exec finally for from global if import in is ' +
-						'lambda not or pass print raise return try yield while';
+						'lambda not or pass raise return try yield while';
 
 		var funcs = '__import__ abs all any apply basestring bin bool buffer callable ' +
 					'chr classmethod cmp coerce compile complex delattr dict dir ' +
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushRuby.js b/vendor/assets/javascripts/sh/shBrushRuby.js
old mode 100644
new mode 100755
similarity index 90%
rename from vendor/assets/javascripts/sh/brushes/shBrushRuby.js
rename to vendor/assets/javascripts/sh/shBrushRuby.js
index ff82130a..faedb0bc
--- a/vendor/assets/javascripts/sh/brushes/shBrushRuby.js
+++ b/vendor/assets/javascripts/sh/shBrushRuby.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushSass.js b/vendor/assets/javascripts/sh/shBrushSass.js
old mode 100644
new mode 100755
similarity index 73%
rename from vendor/assets/javascripts/sh/brushes/shBrushSass.js
rename to vendor/assets/javascripts/sh/shBrushSass.js
index aa04da09..e89fd5bd
--- a/vendor/assets/javascripts/sh/brushes/shBrushSass.js
+++ b/vendor/assets/javascripts/sh/shBrushSass.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -30,6 +30,11 @@
 		{
 			return '\\b' + str.replace(/ /g, '(?!-)(?!:)\\b|\\b()') + '\:\\b';
 		};
+		
+		function getKeywordsPrependedBy(keywords, by)
+		{
+			return '(?:' + keywords.replace(/^\s+|\s+$/g, '').replace(/\s+/g, '|' + by + '\\b').replace(/^/, by + '\\b') + ')\\b';
+		}
 
 		var keywords =	'ascent azimuth background-attachment background-color background-image background-position ' +
 						'background-repeat background baseline bbox border-collapse border-color border-spacing border-style border-top ' +
@@ -44,7 +49,7 @@
 						'page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position ' +
 						'quotes right richness size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress ' +
 						'table-layout text-align top text-decoration text-indent text-shadow text-transform unicode-bidi unicode-range units-per-em ' +
-						'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index';
+						'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index zoom';
 		
 		var values =	'above absolute all always aqua armenian attr aural auto avoid baseline behind below bidi-override black blink block blue bold bolder '+
 						'both bottom braille capitalize caption center center-left center-right circle close-quote code collapse compact condensed '+
@@ -63,24 +68,24 @@
 		
 		var fonts =		'[mM]onospace [tT]ahoma [vV]erdana [aA]rial [hH]elvetica [sS]ans-serif [sS]erif [cC]ourier mono sans serif';
 		
-		var statements		= '!important !default';
-		var preprocessor	= '@import @extend @debug @warn @if @for @while @mixin @include';
+		var statements		= 'important default';
+		var preprocessor	= 'import extend debug warn if else for while mixin function include content media';
 		
 		var r = SyntaxHighlighter.regexLib;
 		
 		this.regexList = [
-			{ regex: r.multiLineCComments,								css: 'comments' },		// multiline comments
-			{ regex: r.singleLineCComments,								css: 'comments' },		// singleline comments
-			{ regex: r.doubleQuotedString,								css: 'string' },		// double quoted strings
-			{ regex: r.singleQuotedString,								css: 'string' },		// single quoted strings
-			{ regex: /\#[a-fA-F0-9]{3,6}/g,								css: 'value' },			// html colors
-			{ regex: /\b(-?\d+)(\.\d+)?(px|em|pt|\:|\%|)\b/g,			css: 'value' },			// sizes
-			{ regex: /\$\w+/g,											css: 'variable' },		// variables
-			{ regex: new RegExp(this.getKeywords(statements), 'g'),		css: 'color3' },		// statements
-			{ regex: new RegExp(this.getKeywords(preprocessor), 'g'),	css: 'preprocessor' },	// preprocessor
-			{ regex: new RegExp(getKeywordsCSS(keywords), 'gm'),		css: 'keyword' },		// keywords
-			{ regex: new RegExp(getValuesCSS(values), 'g'),				css: 'value' },			// values
-			{ regex: new RegExp(this.getKeywords(fonts), 'g'),			css: 'color1' }			// fonts
+			{ regex: r.multiLineCComments,											css: 'comments' },		// multiline comments
+			{ regex: r.singleLineCComments,											css: 'comments' },		// singleline comments
+			{ regex: r.doubleQuotedString,											css: 'string' },		// double quoted strings
+			{ regex: r.singleQuotedString,											css: 'string' },		// single quoted strings
+			{ regex: /\#[a-fA-F0-9]{3,6}/g,											css: 'value' },			// html colors
+			{ regex: /\b(-?\d+)(\.\d+)?(px|em|rem|pt|\:|\%|)\b/g,					css: 'value' },			// sizes
+			{ regex: /\$[\w-]+/g,													css: 'variable' },		// variables
+			{ regex: new RegExp(getKeywordsPrependedBy(statements, '!'), 'g'),		css: 'color3' },		// statements
+			{ regex: new RegExp(getKeywordsPrependedBy(preprocessor, '@'), 'g'),	css: 'preprocessor' },	// preprocessor
+			{ regex: new RegExp(getKeywordsCSS(keywords), 'gm'),					css: 'keyword' },		// keywords
+			{ regex: new RegExp(getValuesCSS(values), 'g'),							css: 'value' },			// values
+			{ regex: new RegExp(this.getKeywords(fonts), 'g'),						css: 'color1' }			// fonts
 			];
 	};
 
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushScala.js b/vendor/assets/javascripts/sh/shBrushScala.js
old mode 100644
new mode 100755
similarity index 89%
rename from vendor/assets/javascripts/sh/brushes/shBrushScala.js
rename to vendor/assets/javascripts/sh/shBrushScala.js
index 4b0b6f04..d1aef6ed
--- a/vendor/assets/javascripts/sh/brushes/shBrushScala.js
+++ b/vendor/assets/javascripts/sh/shBrushScala.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushSql.js b/vendor/assets/javascripts/sh/shBrushSql.js
old mode 100644
new mode 100755
similarity index 73%
rename from vendor/assets/javascripts/sh/brushes/shBrushSql.js
rename to vendor/assets/javascripts/sh/shBrushSql.js
index 5c2cd880..6af9eaca
--- a/vendor/assets/javascripts/sh/brushes/shBrushSql.js
+++ b/vendor/assets/javascripts/sh/shBrushSql.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -46,12 +46,13 @@
 		var operators =	'all and any between cross in join like not null or outer some';
 
 		this.regexList = [
-			{ regex: /--(.*)$/gm,												css: 'comments' },			// one line and multiline comments
-			{ regex: SyntaxHighlighter.regexLib.multiLineDoubleQuotedString,	css: 'string' },			// double quoted strings
-			{ regex: SyntaxHighlighter.regexLib.multiLineSingleQuotedString,	css: 'string' },			// single quoted strings
-			{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),				css: 'color2' },			// functions
-			{ regex: new RegExp(this.getKeywords(operators), 'gmi'),			css: 'color1' },			// operators and such
-			{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),				css: 'keyword' }			// keyword
+			{ regex: /--(.*)$/gm,                                               css: 'comments' },   // one line comments
+			{ regex: /\/\*([^\*][\s\S]*?)?\*\//gm,                              css: 'comments' },   // multi line comments
+			{ regex: SyntaxHighlighter.regexLib.multiLineDoubleQuotedString,    css: 'string' },     // double quoted strings
+			{ regex: SyntaxHighlighter.regexLib.multiLineSingleQuotedString,    css: 'string' },     // single quoted strings
+			{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),                css: 'color2' },     // functions
+			{ regex: new RegExp(this.getKeywords(operators), 'gmi'),            css: 'color1' },     // operators and such
+			{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),             css: 'keyword' }     // keyword
 			];
 	};
 
diff --git a/vendor/assets/javascripts/sh/shBrushTAP.js b/vendor/assets/javascripts/sh/shBrushTAP.js
new file mode 100755
index 00000000..af9d0343
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushTAP.js
@@ -0,0 +1,62 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+    // CommonJS
+    typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+    function Brush() {
+        // Contributed by Chad Granum
+        this.regexList = [
+            // Plan
+            { regex: new RegExp('^1..\\d+', 'gm'), css: 'plain bold italic' },
+
+            // Match ok, not ok, and with test numbers
+            { regex: new RegExp('^ok( \\d+)?', 'gm'),     css: 'keyword' },
+            { regex: new RegExp('^not ok( \\d+)?', 'gm'), css: 'color3 bold' },
+
+            // Directives
+            { regex: new RegExp('(?!^\\s*)#.*$', 'gm'), css: 'variable bold' },
+
+            // Diagnostics
+            { regex: new RegExp('^#.*$', 'gm'), css: 'comments bold' },
+
+            // comments
+            { regex: new RegExp('^(?!(not )?ok)[^1].*$', 'gm'), css: 'comments' },
+
+            // Quoted items in messages
+			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' },
+			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,	css: 'string' },
+        ];
+    }
+
+    Brush.prototype = new SyntaxHighlighter.Highlighter();
+    Brush.aliases   = ['tap', 'Tap', 'TAP'];
+
+    SyntaxHighlighter.brushes.TAP = Brush;
+
+    // CommonJS
+    typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
+
diff --git a/vendor/assets/javascripts/sh/shBrushTypeScript.js b/vendor/assets/javascripts/sh/shBrushTypeScript.js
new file mode 100755
index 00000000..8042785d
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shBrushTypeScript.js
@@ -0,0 +1,55 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+// Brush for the TypeScript language
+// Based on the JavaScript brush - shBrushJScript.js - with some minor alterations
+
+; (function ()
+{
+	// CommonJS
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
+
+	function Brush()
+	{
+		var keywords =	'break case catch class continue ' +
+				'default delete do else enum export extends false  ' +
+				'for function if implements import in instanceof ' +
+				'interface let new null package private protected ' +
+				'static return super switch ' +
+				'this throw true try typeof var while with yield' +
+		    ' any bool declare get module number public set string';   // TypeScript-specific, everything above is common with JavaScript
+
+		var r = SyntaxHighlighter.regexLib;
+		
+		this.regexList = [
+			{ regex: r.multiLineDoubleQuotedString,					css: 'string' },			// double quoted strings
+			{ regex: r.multiLineSingleQuotedString,					css: 'string' },			// single quoted strings
+			{ regex: r.singleLineCComments,							css: 'comments' },			// one line comments
+			{ regex: r.multiLineCComments,							css: 'comments' },			// multiline comments
+			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),	css: 'keyword' }			// keywords
+			];
+	
+		this.forHtmlScript(r.scriptScriptTags);
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['ts', 'typescript'];
+
+	SyntaxHighlighter.brushes.TypeScript = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushVb.js b/vendor/assets/javascripts/sh/shBrushVb.js
old mode 100644
new mode 100755
similarity index 90%
rename from vendor/assets/javascripts/sh/brushes/shBrushVb.js
rename to vendor/assets/javascripts/sh/shBrushVb.js
index be845dc0..f96cb639
--- a/vendor/assets/javascripts/sh/brushes/shBrushVb.js
+++ b/vendor/assets/javascripts/sh/shBrushVb.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushXml.js b/vendor/assets/javascripts/sh/shBrushXml.js
old mode 100644
new mode 100755
similarity index 57%
rename from vendor/assets/javascripts/sh/brushes/shBrushXml.js
rename to vendor/assets/javascripts/sh/shBrushXml.js
index 69d9fd0b..3c180f89
--- a/vendor/assets/javascripts/sh/brushes/shBrushXml.js
+++ b/vendor/assets/javascripts/sh/shBrushXml.js
@@ -6,10 +6,10 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
@@ -17,7 +17,7 @@
 ;(function()
 {
 	// CommonJS
-	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
 
 	function Brush()
 	{
@@ -25,22 +25,24 @@
 		{
 			var constructor = SyntaxHighlighter.Match,
 				code = match[0],
-				tag = new XRegExp('(&lt;|<)[\\s\\/\\?]*(?<name>[:\\w-\\.]+)', 'xg').exec(code),
+				tag = XRegExp.exec(code, XRegExp('(&lt;|<)[\\s\\/\\?!]*(?<name>[:\\w-\\.]+)', 'xg')),
 				result = []
 				;
-		
-			if (match.attributes != null) 
+
+			if (match.attributes != null)
 			{
 				var attributes,
-					regex = new XRegExp('(?<name> [\\w:\\-\\.]+)' +
-										'\\s*=\\s*' +
-										'(?<value> ".*?"|\'.*?\'|\\w+)',
-										'xg');
+					pos = 0,
+					regex = XRegExp('(?<name> [\\w:.-]+)' +
+									'\\s*=\\s*' +
+									'(?<value> ".*?"|\'.*?\'|\\w+)',
+									'xg');
 
-				while ((attributes = regex.exec(code)) != null) 
+				while ((attributes = XRegExp.exec(code, regex, pos)) != null)
 				{
 					result.push(new constructor(attributes.name, match.index + attributes.index, 'color1'));
 					result.push(new constructor(attributes.value, match.index + attributes.index + attributes[0].indexOf(attributes.value), 'string'));
+					pos = attributes.index + attributes[0].length;
 				}
 			}
 
@@ -51,16 +53,16 @@
 
 			return result;
 		}
-	
+
 		this.regexList = [
-			{ regex: new XRegExp('(\\&lt;|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\&gt;|>)', 'gm'),			css: 'color2' },	// <![ ... [ ... ]]>
+			{ regex: XRegExp('(\\&lt;|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\&gt;|>)', 'gm'),			css: 'color2' },	// <![ ... [ ... ]]>
 			{ regex: SyntaxHighlighter.regexLib.xmlComments,												css: 'comments' },	// <!-- ... -->
-			{ regex: new XRegExp('(&lt;|<)[\\s\\/\\?]*(\\w+)(?<attributes>.*?)[\\s\\/\\?]*(&gt;|>)', 'sg'), func: process }
+			{ regex: XRegExp('(&lt;|<)[\\s\\/\\?!]*(\\w+)(?<attributes>.*?)[\\s\\/\\?]*(&gt;|>)', 'sg'), func: process }
 		];
 	};
 
 	Brush.prototype	= new SyntaxHighlighter.Highlighter();
-	Brush.aliases	= ['xml', 'xhtml', 'xslt', 'html'];
+	Brush.aliases	= ['xml', 'xhtml', 'xslt', 'html', 'plist'];
 
 	SyntaxHighlighter.brushes.Xml = Brush;
 
diff --git a/vendor/assets/javascripts/sh/brushes/shBrushYaml.js b/vendor/assets/javascripts/sh/shBrushYaml.js
similarity index 100%
rename from vendor/assets/javascripts/sh/brushes/shBrushYaml.js
rename to vendor/assets/javascripts/sh/shBrushYaml.js
diff --git a/vendor/assets/javascripts/sh/shCore.js b/vendor/assets/javascripts/sh/shCore.js
old mode 100644
new mode 100755
index aed09a86..e532cdfe
--- a/vendor/assets/javascripts/sh/shCore.js
+++ b/vendor/assets/javascripts/sh/shCore.js
@@ -1,25 +1,1306 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+/*!
+ * XRegExp v2.0.0
+ * (c) 2007-2012 Steven Levithan <http://xregexp.com/>
+ * MIT License
+ */
+
+/**
+ * XRegExp provides augmented, extensible JavaScript regular expressions. You get new syntax,
+ * flags, and methods beyond what browsers support natively. XRegExp is also a regex utility belt
+ * with tools to make your client-side grepping simpler and more powerful, while freeing you from
+ * worrying about pesky cross-browser inconsistencies and the dubious `lastIndex` property. See
+ * XRegExp's documentation (http://xregexp.com/) for more details.
+ * @module xregexp
+ * @requires N/A
+ */
+var XRegExp;
+
+// Avoid running twice; that would reset tokens and could break references to native globals
+XRegExp = XRegExp || (function (undef) {
+    "use strict";
+
+/*--------------------------------------
+ *  Private variables
+ *------------------------------------*/
+
+    var self,
+        addToken,
+        add,
+
+// Optional features; can be installed and uninstalled
+        features = {
+            natives: false,
+            extensibility: false
+        },
+
+// Store native methods to use and restore ("native" is an ES3 reserved keyword)
+        nativ = {
+            exec: RegExp.prototype.exec,
+            test: RegExp.prototype.test,
+            match: String.prototype.match,
+            replace: String.prototype.replace,
+            split: String.prototype.split
+        },
+
+// Storage for fixed/extended native methods
+        fixed = {},
+
+// Storage for cached regexes
+        cache = {},
+
+// Storage for addon tokens
+        tokens = [],
+
+// Token scopes
+        defaultScope = "default",
+        classScope = "class",
+
+// Regexes that match native regex syntax
+        nativeTokens = {
+            // Any native multicharacter token in default scope (includes octals, excludes character classes)
+            "default": /^(?:\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??)/,
+            // Any native multicharacter token in character class scope (includes octals)
+            "class": /^(?:\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S]))/
+        },
+
+// Any backreference in replacement strings
+        replacementToken = /\$(?:{([\w$]+)}|(\d\d?|[\s\S]))/g,
+
+// Any character with a later instance in the string
+        duplicateFlags = /([\s\S])(?=[\s\S]*\1)/g,
+
+// Any greedy/lazy quantifier
+        quantifier = /^(?:[?*+]|{\d+(?:,\d*)?})\??/,
+
+// Check for correct `exec` handling of nonparticipating capturing groups
+        compliantExecNpcg = nativ.exec.call(/()??/, "")[1] === undef,
+
+// Check for flag y support (Firefox 3+)
+        hasNativeY = RegExp.prototype.sticky !== undef,
+
+// Used to kill infinite recursion during XRegExp construction
+        isInsideConstructor = false,
+
+// Storage for known flags, including addon flags
+        registeredFlags = "gim" + (hasNativeY ? "y" : "");
+
+/*--------------------------------------
+ *  Private helper functions
+ *------------------------------------*/
+
+/**
+ * Attaches XRegExp.prototype properties and named capture supporting data to a regex object.
+ * @private
+ * @param {RegExp} regex Regex to augment.
+ * @param {Array} captureNames Array with capture names, or null.
+ * @param {Boolean} [isNative] Whether the regex was created by `RegExp` rather than `XRegExp`.
+ * @returns {RegExp} Augmented regex.
+ */
+    function augment(regex, captureNames, isNative) {
+        var p;
+        // Can't auto-inherit these since the XRegExp constructor returns a nonprimitive value
+        for (p in self.prototype) {
+            if (self.prototype.hasOwnProperty(p)) {
+                regex[p] = self.prototype[p];
+            }
+        }
+        regex.xregexp = {captureNames: captureNames, isNative: !!isNative};
+        return regex;
+    }
+
+/**
+ * Returns native `RegExp` flags used by a regex object.
+ * @private
+ * @param {RegExp} regex Regex to check.
+ * @returns {String} Native flags in use.
+ */
+    function getNativeFlags(regex) {
+        //return nativ.exec.call(/\/([a-z]*)$/i, String(regex))[1];
+        return (regex.global     ? "g" : "") +
+               (regex.ignoreCase ? "i" : "") +
+               (regex.multiline  ? "m" : "") +
+               (regex.extended   ? "x" : "") + // Proposed for ES6, included in AS3
+               (regex.sticky     ? "y" : ""); // Proposed for ES6, included in Firefox 3+
+    }
+
+/**
+ * Copies a regex object while preserving special properties for named capture and augmenting with
+ * `XRegExp.prototype` methods. The copy has a fresh `lastIndex` property (set to zero). Allows
+ * adding and removing flags while copying the regex.
+ * @private
+ * @param {RegExp} regex Regex to copy.
+ * @param {String} [addFlags] Flags to be added while copying the regex.
+ * @param {String} [removeFlags] Flags to be removed while copying the regex.
+ * @returns {RegExp} Copy of the provided regex, possibly with modified flags.
+ */
+    function copy(regex, addFlags, removeFlags) {
+        if (!self.isRegExp(regex)) {
+            throw new TypeError("type RegExp expected");
+        }
+        var flags = nativ.replace.call(getNativeFlags(regex) + (addFlags || ""), duplicateFlags, "");
+        if (removeFlags) {
+            // Would need to escape `removeFlags` if this was public
+            flags = nativ.replace.call(flags, new RegExp("[" + removeFlags + "]+", "g"), "");
+        }
+        if (regex.xregexp && !regex.xregexp.isNative) {
+            // Compiling the current (rather than precompilation) source preserves the effects of nonnative source flags
+            regex = augment(self(regex.source, flags),
+                            regex.xregexp.captureNames ? regex.xregexp.captureNames.slice(0) : null);
+        } else {
+            // Augment with `XRegExp.prototype` methods, but use native `RegExp` (avoid searching for special tokens)
+            regex = augment(new RegExp(regex.source, flags), null, true);
+        }
+        return regex;
+    }
+
+/*
+ * Returns the last index at which a given value can be found in an array, or `-1` if it's not
+ * present. The array is searched backwards.
+ * @private
+ * @param {Array} array Array to search.
+ * @param {*} value Value to locate in the array.
+ * @returns {Number} Last zero-based index at which the item is found, or -1.
+ */
+    function lastIndexOf(array, value) {
+        var i = array.length;
+        if (Array.prototype.lastIndexOf) {
+            return array.lastIndexOf(value); // Use the native method if available
+        }
+        while (i--) {
+            if (array[i] === value) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+/**
+ * Determines whether an object is of the specified type.
+ * @private
+ * @param {*} value Object to check.
+ * @param {String} type Type to check for, in lowercase.
+ * @returns {Boolean} Whether the object matches the type.
+ */
+    function isType(value, type) {
+        return Object.prototype.toString.call(value).toLowerCase() === "[object " + type + "]";
+    }
+
+/**
+ * Prepares an options object from the given value.
+ * @private
+ * @param {String|Object} value Value to convert to an options object.
+ * @returns {Object} Options object.
+ */
+    function prepareOptions(value) {
+        value = value || {};
+        if (value === "all" || value.all) {
+            value = {natives: true, extensibility: true};
+        } else if (isType(value, "string")) {
+            value = self.forEach(value, /[^\s,]+/, function (m) {
+                this[m] = true;
+            }, {});
+        }
+        return value;
+    }
+
+/**
+ * Runs built-in/custom tokens in reverse insertion order, until a match is found.
+ * @private
+ * @param {String} pattern Original pattern from which an XRegExp object is being built.
+ * @param {Number} pos Position to search for tokens within `pattern`.
+ * @param {Number} scope Current regex scope.
+ * @param {Object} context Context object assigned to token handler functions.
+ * @returns {Object} Object with properties `output` (the substitution string returned by the
+ *   successful token handler) and `match` (the token's match array), or null.
+ */
+    function runTokens(pattern, pos, scope, context) {
+        var i = tokens.length,
+            result = null,
+            match,
+            t;
+        // Protect against constructing XRegExps within token handler and trigger functions
+        isInsideConstructor = true;
+        // Must reset `isInsideConstructor`, even if a `trigger` or `handler` throws
+        try {
+            while (i--) { // Run in reverse order
+                t = tokens[i];
+                if ((t.scope === "all" || t.scope === scope) && (!t.trigger || t.trigger.call(context))) {
+                    t.pattern.lastIndex = pos;
+                    match = fixed.exec.call(t.pattern, pattern); // Fixed `exec` here allows use of named backreferences, etc.
+                    if (match && match.index === pos) {
+                        result = {
+                            output: t.handler.call(context, match, scope),
+                            match: match
+                        };
+                        break;
+                    }
+                }
+            }
+        } catch (err) {
+            throw err;
+        } finally {
+            isInsideConstructor = false;
+        }
+        return result;
+    }
+
+/**
+ * Enables or disables XRegExp syntax and flag extensibility.
+ * @private
+ * @param {Boolean} on `true` to enable; `false` to disable.
+ */
+    function setExtensibility(on) {
+        self.addToken = addToken[on ? "on" : "off"];
+        features.extensibility = on;
+    }
+
+/**
+ * Enables or disables native method overrides.
+ * @private
+ * @param {Boolean} on `true` to enable; `false` to disable.
+ */
+    function setNatives(on) {
+        RegExp.prototype.exec = (on ? fixed : nativ).exec;
+        RegExp.prototype.test = (on ? fixed : nativ).test;
+        String.prototype.match = (on ? fixed : nativ).match;
+        String.prototype.replace = (on ? fixed : nativ).replace;
+        String.prototype.split = (on ? fixed : nativ).split;
+        features.natives = on;
+    }
+
+/*--------------------------------------
+ *  Constructor
+ *------------------------------------*/
+
+/**
+ * Creates an extended regular expression object for matching text with a pattern. Differs from a
+ * native regular expression in that additional syntax and flags are supported. The returned object
+ * is in fact a native `RegExp` and works with all native methods.
+ * @class XRegExp
+ * @constructor
+ * @param {String|RegExp} pattern Regex pattern string, or an existing `RegExp` object to copy.
+ * @param {String} [flags] Any combination of flags:
+ *   <li>`g` - global
+ *   <li>`i` - ignore case
+ *   <li>`m` - multiline anchors
+ *   <li>`n` - explicit capture
+ *   <li>`s` - dot matches all (aka singleline)
+ *   <li>`x` - free-spacing and line comments (aka extended)
+ *   <li>`y` - sticky (Firefox 3+ only)
+ *   Flags cannot be provided when constructing one `RegExp` from another.
+ * @returns {RegExp} Extended regular expression object.
+ * @example
+ *
+ * // With named capture and flag x
+ * date = XRegExp('(?<year>  [0-9]{4}) -?  # year  \n\
+ *                 (?<month> [0-9]{2}) -?  # month \n\
+ *                 (?<day>   [0-9]{2})     # day   ', 'x');
+ *
+ * // Passing a regex object to copy it. The copy maintains special properties for named capture,
+ * // is augmented with `XRegExp.prototype` methods, and has a fresh `lastIndex` property (set to
+ * // zero). Native regexes are not recompiled using XRegExp syntax.
+ * XRegExp(/regex/);
+ */
+    self = function (pattern, flags) {
+        if (self.isRegExp(pattern)) {
+            if (flags !== undef) {
+                throw new TypeError("can't supply flags when constructing one RegExp from another");
+            }
+            return copy(pattern);
+        }
+        // Tokens become part of the regex construction process, so protect against infinite recursion
+        // when an XRegExp is constructed within a token handler function
+        if (isInsideConstructor) {
+            throw new Error("can't call the XRegExp constructor within token definition functions");
+        }
+
+        var output = [],
+            scope = defaultScope,
+            tokenContext = {
+                hasNamedCapture: false,
+                captureNames: [],
+                hasFlag: function (flag) {
+                    return flags.indexOf(flag) > -1;
+                }
+            },
+            pos = 0,
+            tokenResult,
+            match,
+            chr;
+        pattern = pattern === undef ? "" : String(pattern);
+        flags = flags === undef ? "" : String(flags);
+
+        if (nativ.match.call(flags, duplicateFlags)) { // Don't use test/exec because they would update lastIndex
+            throw new SyntaxError("invalid duplicate regular expression flag");
+        }
+        // Strip/apply leading mode modifier with any combination of flags except g or y: (?imnsx)
+        pattern = nativ.replace.call(pattern, /^\(\?([\w$]+)\)/, function ($0, $1) {
+            if (nativ.test.call(/[gy]/, $1)) {
+                throw new SyntaxError("can't use flag g or y in mode modifier");
+            }
+            flags = nativ.replace.call(flags + $1, duplicateFlags, "");
+            return "";
+        });
+        self.forEach(flags, /[\s\S]/, function (m) {
+            if (registeredFlags.indexOf(m[0]) < 0) {
+                throw new SyntaxError("invalid regular expression flag " + m[0]);
+            }
+        });
+
+        while (pos < pattern.length) {
+            // Check for custom tokens at the current position
+            tokenResult = runTokens(pattern, pos, scope, tokenContext);
+            if (tokenResult) {
+                output.push(tokenResult.output);
+                pos += (tokenResult.match[0].length || 1);
+            } else {
+                // Check for native tokens (except character classes) at the current position
+                match = nativ.exec.call(nativeTokens[scope], pattern.slice(pos));
+                if (match) {
+                    output.push(match[0]);
+                    pos += match[0].length;
+                } else {
+                    chr = pattern.charAt(pos);
+                    if (chr === "[") {
+                        scope = classScope;
+                    } else if (chr === "]") {
+                        scope = defaultScope;
+                    }
+                    // Advance position by one character
+                    output.push(chr);
+                    ++pos;
+                }
+            }
+        }
+
+        return augment(new RegExp(output.join(""), nativ.replace.call(flags, /[^gimy]+/g, "")),
+                       tokenContext.hasNamedCapture ? tokenContext.captureNames : null);
+    };
+
+/*--------------------------------------
+ *  Public methods/properties
+ *------------------------------------*/
+
+// Installed and uninstalled states for `XRegExp.addToken`
+    addToken = {
+        on: function (regex, handler, options) {
+            options = options || {};
+            if (regex) {
+                tokens.push({
+                    pattern: copy(regex, "g" + (hasNativeY ? "y" : "")),
+                    handler: handler,
+                    scope: options.scope || defaultScope,
+                    trigger: options.trigger || null
+                });
+            }
+            // Providing `customFlags` with null `regex` and `handler` allows adding flags that do
+            // nothing, but don't throw an error
+            if (options.customFlags) {
+                registeredFlags = nativ.replace.call(registeredFlags + options.customFlags, duplicateFlags, "");
+            }
+        },
+        off: function () {
+            throw new Error("extensibility must be installed before using addToken");
+        }
+    };
+
+/**
+ * Extends or changes XRegExp syntax and allows custom flags. This is used internally and can be
+ * used to create XRegExp addons. `XRegExp.install('extensibility')` must be run before calling
+ * this function, or an error is thrown. If more than one token can match the same string, the last
+ * added wins.
+ * @memberOf XRegExp
+ * @param {RegExp} regex Regex object that matches the new token.
+ * @param {Function} handler Function that returns a new pattern string (using native regex syntax)
+ *   to replace the matched token within all future XRegExp regexes. Has access to persistent
+ *   properties of the regex being built, through `this`. Invoked with two arguments:
+ *   <li>The match array, with named backreference properties.
+ *   <li>The regex scope where the match was found.
+ * @param {Object} [options] Options object with optional properties:
+ *   <li>`scope` {String} Scopes where the token applies: 'default', 'class', or 'all'.
+ *   <li>`trigger` {Function} Function that returns `true` when the token should be applied; e.g.,
+ *     if a flag is set. If `false` is returned, the matched string can be matched by other tokens.
+ *     Has access to persistent properties of the regex being built, through `this` (including
+ *     function `this.hasFlag`).
+ *   <li>`customFlags` {String} Nonnative flags used by the token's handler or trigger functions.
+ *     Prevents XRegExp from throwing an invalid flag error when the specified flags are used.
+ * @example
+ *
+ * // Basic usage: Adds \a for ALERT character
+ * XRegExp.addToken(
+ *   /\\a/,
+ *   function () {return '\\x07';},
+ *   {scope: 'all'}
+ * );
+ * XRegExp('\\a[\\a-\\n]+').test('\x07\n\x07'); // -> true
+ */
+    self.addToken = addToken.off;
+
+/**
+ * Caches and returns the result of calling `XRegExp(pattern, flags)`. On any subsequent call with
+ * the same pattern and flag combination, the cached copy is returned.
+ * @memberOf XRegExp
+ * @param {String} pattern Regex pattern string.
+ * @param {String} [flags] Any combination of XRegExp flags.
+ * @returns {RegExp} Cached XRegExp object.
+ * @example
+ *
+ * while (match = XRegExp.cache('.', 'gs').exec(str)) {
+ *   // The regex is compiled once only
+ * }
+ */
+    self.cache = function (pattern, flags) {
+        var key = pattern + "/" + (flags || "");
+        return cache[key] || (cache[key] = self(pattern, flags));
+    };
+
+/**
+ * Escapes any regular expression metacharacters, for use when matching literal strings. The result
+ * can safely be used at any point within a regex that uses any flags.
+ * @memberOf XRegExp
+ * @param {String} str String to escape.
+ * @returns {String} String with regex metacharacters escaped.
+ * @example
+ *
+ * XRegExp.escape('Escaped? <.>');
+ * // -> 'Escaped\?\ <\.>'
+ */
+    self.escape = function (str) {
+        return nativ.replace.call(str, /[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    };
+
+/**
+ * Executes a regex search in a specified string. Returns a match array or `null`. If the provided
+ * regex uses named capture, named backreference properties are included on the match array.
+ * Optional `pos` and `sticky` arguments specify the search start position, and whether the match
+ * must start at the specified position only. The `lastIndex` property of the provided regex is not
+ * used, but is updated for compatibility. Also fixes browser bugs compared to the native
+ * `RegExp.prototype.exec` and can be used reliably cross-browser.
+ * @memberOf XRegExp
+ * @param {String} str String to search.
+ * @param {RegExp} regex Regex to search with.
+ * @param {Number} [pos=0] Zero-based index at which to start the search.
+ * @param {Boolean|String} [sticky=false] Whether the match must start at the specified position
+ *   only. The string `'sticky'` is accepted as an alternative to `true`.
+ * @returns {Array} Match array with named backreference properties, or null.
+ * @example
+ *
+ * // Basic use, with named backreference
+ * var match = XRegExp.exec('U+2620', XRegExp('U\\+(?<hex>[0-9A-F]{4})'));
+ * match.hex; // -> '2620'
+ *
+ * // With pos and sticky, in a loop
+ * var pos = 2, result = [], match;
+ * while (match = XRegExp.exec('<1><2><3><4>5<6>', /<(\d)>/, pos, 'sticky')) {
+ *   result.push(match[1]);
+ *   pos = match.index + match[0].length;
+ * }
+ * // result -> ['2', '3', '4']
+ */
+    self.exec = function (str, regex, pos, sticky) {
+        var r2 = copy(regex, "g" + (sticky && hasNativeY ? "y" : ""), (sticky === false ? "y" : "")),
+            match;
+        r2.lastIndex = pos = pos || 0;
+        match = fixed.exec.call(r2, str); // Fixed `exec` required for `lastIndex` fix, etc.
+        if (sticky && match && match.index !== pos) {
+            match = null;
+        }
+        if (regex.global) {
+            regex.lastIndex = match ? r2.lastIndex : 0;
+        }
+        return match;
+    };
+
+/**
+ * Executes a provided function once per regex match.
+ * @memberOf XRegExp
+ * @param {String} str String to search.
+ * @param {RegExp} regex Regex to search with.
+ * @param {Function} callback Function to execute for each match. Invoked with four arguments:
+ *   <li>The match array, with named backreference properties.
+ *   <li>The zero-based match index.
+ *   <li>The string being traversed.
+ *   <li>The regex object being used to traverse the string.
+ * @param {*} [context] Object to use as `this` when executing `callback`.
+ * @returns {*} Provided `context` object.
+ * @example
+ *
+ * // Extracts every other digit from a string
+ * XRegExp.forEach('1a2345', /\d/, function (match, i) {
+ *   if (i % 2) this.push(+match[0]);
+ * }, []);
+ * // -> [2, 4]
+ */
+    self.forEach = function (str, regex, callback, context) {
+        var pos = 0,
+            i = -1,
+            match;
+        while ((match = self.exec(str, regex, pos))) {
+            callback.call(context, match, ++i, str, regex);
+            pos = match.index + (match[0].length || 1);
+        }
+        return context;
+    };
+
+/**
+ * Copies a regex object and adds flag `g`. The copy maintains special properties for named
+ * capture, is augmented with `XRegExp.prototype` methods, and has a fresh `lastIndex` property
+ * (set to zero). Native regexes are not recompiled using XRegExp syntax.
+ * @memberOf XRegExp
+ * @param {RegExp} regex Regex to globalize.
+ * @returns {RegExp} Copy of the provided regex with flag `g` added.
+ * @example
+ *
+ * var globalCopy = XRegExp.globalize(/regex/);
+ * globalCopy.global; // -> true
+ */
+    self.globalize = function (regex) {
+        return copy(regex, "g");
+    };
+
+/**
+ * Installs optional features according to the specified options.
+ * @memberOf XRegExp
+ * @param {Object|String} options Options object or string.
+ * @example
+ *
+ * // With an options object
+ * XRegExp.install({
+ *   // Overrides native regex methods with fixed/extended versions that support named
+ *   // backreferences and fix numerous cross-browser bugs
+ *   natives: true,
+ *
+ *   // Enables extensibility of XRegExp syntax and flags
+ *   extensibility: true
+ * });
+ *
+ * // With an options string
+ * XRegExp.install('natives extensibility');
+ *
+ * // Using a shortcut to install all optional features
+ * XRegExp.install('all');
+ */
+    self.install = function (options) {
+        options = prepareOptions(options);
+        if (!features.natives && options.natives) {
+            setNatives(true);
+        }
+        if (!features.extensibility && options.extensibility) {
+            setExtensibility(true);
+        }
+    };
+
+/**
+ * Checks whether an individual optional feature is installed.
+ * @memberOf XRegExp
+ * @param {String} feature Name of the feature to check. One of:
+ *   <li>`natives`
+ *   <li>`extensibility`
+ * @returns {Boolean} Whether the feature is installed.
+ * @example
+ *
+ * XRegExp.isInstalled('natives');
+ */
+    self.isInstalled = function (feature) {
+        return !!(features[feature]);
+    };
+
+/**
+ * Returns `true` if an object is a regex; `false` if it isn't. This works correctly for regexes
+ * created in another frame, when `instanceof` and `constructor` checks would fail.
+ * @memberOf XRegExp
+ * @param {*} value Object to check.
+ * @returns {Boolean} Whether the object is a `RegExp` object.
+ * @example
+ *
+ * XRegExp.isRegExp('string'); // -> false
+ * XRegExp.isRegExp(/regex/i); // -> true
+ * XRegExp.isRegExp(RegExp('^', 'm')); // -> true
+ * XRegExp.isRegExp(XRegExp('(?s).')); // -> true
+ */
+    self.isRegExp = function (value) {
+        return isType(value, "regexp");
+    };
+
+/**
+ * Retrieves the matches from searching a string using a chain of regexes that successively search
+ * within previous matches. The provided `chain` array can contain regexes and objects with `regex`
+ * and `backref` properties. When a backreference is specified, the named or numbered backreference
+ * is passed forward to the next regex or returned.
+ * @memberOf XRegExp
+ * @param {String} str String to search.
+ * @param {Array} chain Regexes that each search for matches within preceding results.
+ * @returns {Array} Matches by the last regex in the chain, or an empty array.
+ * @example
+ *
+ * // Basic usage; matches numbers within <b> tags
+ * XRegExp.matchChain('1 <b>2</b> 3 <b>4 a 56</b>', [
+ *   XRegExp('(?is)<b>.*?</b>'),
+ *   /\d+/
+ * ]);
+ * // -> ['2', '4', '56']
+ *
+ * // Passing forward and returning specific backreferences
+ * html = '<a href="http://xregexp.com/api/">XRegExp</a>\
+ *         <a href="http://www.google.com/">Google</a>';
+ * XRegExp.matchChain(html, [
+ *   {regex: /<a href="([^"]+)">/i, backref: 1},
+ *   {regex: XRegExp('(?i)^https?://(?<domain>[^/?#]+)'), backref: 'domain'}
+ * ]);
+ * // -> ['xregexp.com', 'www.google.com']
+ */
+    self.matchChain = function (str, chain) {
+        return (function recurseChain(values, level) {
+            var item = chain[level].regex ? chain[level] : {regex: chain[level]},
+                matches = [],
+                addMatch = function (match) {
+                    matches.push(item.backref ? (match[item.backref] || "") : match[0]);
+                },
+                i;
+            for (i = 0; i < values.length; ++i) {
+                self.forEach(values[i], item.regex, addMatch);
+            }
+            return ((level === chain.length - 1) || !matches.length) ?
+                    matches :
+                    recurseChain(matches, level + 1);
+        }([str], 0));
+    };
+
+/**
+ * Returns a new string with one or all matches of a pattern replaced. The pattern can be a string
+ * or regex, and the replacement can be a string or a function to be called for each match. To
+ * perform a global search and replace, use the optional `scope` argument or include flag `g` if
+ * using a regex. Replacement strings can use `${n}` for named and numbered backreferences.
+ * Replacement functions can use named backreferences via `arguments[0].name`. Also fixes browser
+ * bugs compared to the native `String.prototype.replace` and can be used reliably cross-browser.
+ * @memberOf XRegExp
+ * @param {String} str String to search.
+ * @param {RegExp|String} search Search pattern to be replaced.
+ * @param {String|Function} replacement Replacement string or a function invoked to create it.
+ *   Replacement strings can include special replacement syntax:
+ *     <li>$$ - Inserts a literal '$'.
+ *     <li>$&, $0 - Inserts the matched substring.
+ *     <li>$` - Inserts the string that precedes the matched substring (left context).
+ *     <li>$' - Inserts the string that follows the matched substring (right context).
+ *     <li>$n, $nn - Where n/nn are digits referencing an existent capturing group, inserts
+ *       backreference n/nn.
+ *     <li>${n} - Where n is a name or any number of digits that reference an existent capturing
+ *       group, inserts backreference n.
+ *   Replacement functions are invoked with three or more arguments:
+ *     <li>The matched substring (corresponds to $& above). Named backreferences are accessible as
+ *       properties of this first argument.
+ *     <li>0..n arguments, one for each backreference (corresponding to $1, $2, etc. above).
+ *     <li>The zero-based index of the match within the total search string.
+ *     <li>The total string being searched.
+ * @param {String} [scope='one'] Use 'one' to replace the first match only, or 'all'. If not
+ *   explicitly specified and using a regex with flag `g`, `scope` is 'all'.
+ * @returns {String} New string with one or all matches replaced.
+ * @example
+ *
+ * // Regex search, using named backreferences in replacement string
+ * var name = XRegExp('(?<first>\\w+) (?<last>\\w+)');
+ * XRegExp.replace('John Smith', name, '${last}, ${first}');
+ * // -> 'Smith, John'
+ *
+ * // Regex search, using named backreferences in replacement function
+ * XRegExp.replace('John Smith', name, function (match) {
+ *   return match.last + ', ' + match.first;
+ * });
+ * // -> 'Smith, John'
+ *
+ * // Global string search/replacement
+ * XRegExp.replace('RegExp builds RegExps', 'RegExp', 'XRegExp', 'all');
+ * // -> 'XRegExp builds XRegExps'
+ */
+    self.replace = function (str, search, replacement, scope) {
+        var isRegex = self.isRegExp(search),
+            search2 = search,
+            result;
+        if (isRegex) {
+            if (scope === undef && search.global) {
+                scope = "all"; // Follow flag g when `scope` isn't explicit
+            }
+            // Note that since a copy is used, `search`'s `lastIndex` isn't updated *during* replacement iterations
+            search2 = copy(search, scope === "all" ? "g" : "", scope === "all" ? "" : "g");
+        } else if (scope === "all") {
+            search2 = new RegExp(self.escape(String(search)), "g");
+        }
+        result = fixed.replace.call(String(str), search2, replacement); // Fixed `replace` required for named backreferences, etc.
+        if (isRegex && search.global) {
+            search.lastIndex = 0; // Fixes IE, Safari bug (last tested IE 9, Safari 5.1)
+        }
+        return result;
+    };
+
+/**
+ * Splits a string into an array of strings using a regex or string separator. Matches of the
+ * separator are not included in the result array. However, if `separator` is a regex that contains
+ * capturing groups, backreferences are spliced into the result each time `separator` is matched.
+ * Fixes browser bugs compared to the native `String.prototype.split` and can be used reliably
+ * cross-browser.
+ * @memberOf XRegExp
+ * @param {String} str String to split.
+ * @param {RegExp|String} separator Regex or string to use for separating the string.
+ * @param {Number} [limit] Maximum number of items to include in the result array.
+ * @returns {Array} Array of substrings.
+ * @example
+ *
+ * // Basic use
+ * XRegExp.split('a b c', ' ');
+ * // -> ['a', 'b', 'c']
+ *
+ * // With limit
+ * XRegExp.split('a b c', ' ', 2);
+ * // -> ['a', 'b']
+ *
+ * // Backreferences in result array
+ * XRegExp.split('..word1..', /([a-z]+)(\d+)/i);
+ * // -> ['..', 'word', '1', '..']
+ */
+    self.split = function (str, separator, limit) {
+        return fixed.split.call(str, separator, limit);
+    };
+
+/**
+ * Executes a regex search in a specified string. Returns `true` or `false`. Optional `pos` and
+ * `sticky` arguments specify the search start position, and whether the match must start at the
+ * specified position only. The `lastIndex` property of the provided regex is not used, but is
+ * updated for compatibility. Also fixes browser bugs compared to the native
+ * `RegExp.prototype.test` and can be used reliably cross-browser.
+ * @memberOf XRegExp
+ * @param {String} str String to search.
+ * @param {RegExp} regex Regex to search with.
+ * @param {Number} [pos=0] Zero-based index at which to start the search.
+ * @param {Boolean|String} [sticky=false] Whether the match must start at the specified position
+ *   only. The string `'sticky'` is accepted as an alternative to `true`.
+ * @returns {Boolean} Whether the regex matched the provided value.
+ * @example
+ *
+ * // Basic use
+ * XRegExp.test('abc', /c/); // -> true
+ *
+ * // With pos and sticky
+ * XRegExp.test('abc', /c/, 0, 'sticky'); // -> false
+ */
+    self.test = function (str, regex, pos, sticky) {
+        // Do this the easy way :-)
+        return !!self.exec(str, regex, pos, sticky);
+    };
+
+/**
+ * Uninstalls optional features according to the specified options.
+ * @memberOf XRegExp
+ * @param {Object|String} options Options object or string.
+ * @example
+ *
+ * // With an options object
+ * XRegExp.uninstall({
+ *   // Restores native regex methods
+ *   natives: true,
+ *
+ *   // Disables additional syntax and flag extensions
+ *   extensibility: true
+ * });
+ *
+ * // With an options string
+ * XRegExp.uninstall('natives extensibility');
+ *
+ * // Using a shortcut to uninstall all optional features
+ * XRegExp.uninstall('all');
+ */
+    self.uninstall = function (options) {
+        options = prepareOptions(options);
+        if (features.natives && options.natives) {
+            setNatives(false);
+        }
+        if (features.extensibility && options.extensibility) {
+            setExtensibility(false);
+        }
+    };
+
+/**
+ * Returns an XRegExp object that is the union of the given patterns. Patterns can be provided as
+ * regex objects or strings. Metacharacters are escaped in patterns provided as strings.
+ * Backreferences in provided regex objects are automatically renumbered to work correctly. Native
+ * flags used by provided regexes are ignored in favor of the `flags` argument.
+ * @memberOf XRegExp
+ * @param {Array} patterns Regexes and strings to combine.
+ * @param {String} [flags] Any combination of XRegExp flags.
+ * @returns {RegExp} Union of the provided regexes and strings.
+ * @example
+ *
+ * XRegExp.union(['a+b*c', /(dogs)\1/, /(cats)\1/], 'i');
+ * // -> /a\+b\*c|(dogs)\1|(cats)\2/i
+ *
+ * XRegExp.union([XRegExp('(?<pet>dogs)\\k<pet>'), XRegExp('(?<pet>cats)\\k<pet>')]);
+ * // -> XRegExp('(?<pet>dogs)\\k<pet>|(?<pet>cats)\\k<pet>')
+ */
+    self.union = function (patterns, flags) {
+        var parts = /(\()(?!\?)|\\([1-9]\d*)|\\[\s\S]|\[(?:[^\\\]]|\\[\s\S])*]/g,
+            numCaptures = 0,
+            numPriorCaptures,
+            captureNames,
+            rewrite = function (match, paren, backref) {
+                var name = captureNames[numCaptures - numPriorCaptures];
+                if (paren) { // Capturing group
+                    ++numCaptures;
+                    if (name) { // If the current capture has a name
+                        return "(?<" + name + ">";
+                    }
+                } else if (backref) { // Backreference
+                    return "\\" + (+backref + numPriorCaptures);
+                }
+                return match;
+            },
+            output = [],
+            pattern,
+            i;
+        if (!(isType(patterns, "array") && patterns.length)) {
+            throw new TypeError("patterns must be a nonempty array");
+        }
+        for (i = 0; i < patterns.length; ++i) {
+            pattern = patterns[i];
+            if (self.isRegExp(pattern)) {
+                numPriorCaptures = numCaptures;
+                captureNames = (pattern.xregexp && pattern.xregexp.captureNames) || [];
+                // Rewrite backreferences. Passing to XRegExp dies on octals and ensures patterns
+                // are independently valid; helps keep this simple. Named captures are put back
+                output.push(self(pattern.source).source.replace(parts, rewrite));
+            } else {
+                output.push(self.escape(pattern));
+            }
+        }
+        return self(output.join("|"), flags);
+    };
+
+/**
+ * The XRegExp version number.
+ * @static
+ * @memberOf XRegExp
+ * @type String
+ */
+    self.version = "2.0.0";
+
+/*--------------------------------------
+ *  Fixed/extended native methods
+ *------------------------------------*/
+
+/**
+ * Adds named capture support (with backreferences returned as `result.name`), and fixes browser
+ * bugs in the native `RegExp.prototype.exec`. Calling `XRegExp.install('natives')` uses this to
+ * override the native method. Use via `XRegExp.exec` without overriding natives.
+ * @private
+ * @param {String} str String to search.
+ * @returns {Array} Match array with named backreference properties, or null.
+ */
+    fixed.exec = function (str) {
+        var match, name, r2, origLastIndex, i;
+        if (!this.global) {
+            origLastIndex = this.lastIndex;
+        }
+        match = nativ.exec.apply(this, arguments);
+        if (match) {
+            // Fix browsers whose `exec` methods don't consistently return `undefined` for
+            // nonparticipating capturing groups
+            if (!compliantExecNpcg && match.length > 1 && lastIndexOf(match, "") > -1) {
+                r2 = new RegExp(this.source, nativ.replace.call(getNativeFlags(this), "g", ""));
+                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
+                // matching due to characters outside the match
+                nativ.replace.call(String(str).slice(match.index), r2, function () {
+                    var i;
+                    for (i = 1; i < arguments.length - 2; ++i) {
+                        if (arguments[i] === undef) {
+                            match[i] = undef;
+                        }
+                    }
+                });
+            }
+            // Attach named capture properties
+            if (this.xregexp && this.xregexp.captureNames) {
+                for (i = 1; i < match.length; ++i) {
+                    name = this.xregexp.captureNames[i - 1];
+                    if (name) {
+                        match[name] = match[i];
+                    }
+                }
+            }
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (this.global && !match[0].length && (this.lastIndex > match.index)) {
+                this.lastIndex = match.index;
+            }
+        }
+        if (!this.global) {
+            this.lastIndex = origLastIndex; // Fixes IE, Opera bug (last tested IE 9, Opera 11.6)
+        }
+        return match;
+    };
+
+/**
+ * Fixes browser bugs in the native `RegExp.prototype.test`. Calling `XRegExp.install('natives')`
+ * uses this to override the native method.
+ * @private
+ * @param {String} str String to search.
+ * @returns {Boolean} Whether the regex matched the provided value.
+ */
+    fixed.test = function (str) {
+        // Do this the easy way :-)
+        return !!fixed.exec.call(this, str);
+    };
+
+/**
+ * Adds named capture support (with backreferences returned as `result.name`), and fixes browser
+ * bugs in the native `String.prototype.match`. Calling `XRegExp.install('natives')` uses this to
+ * override the native method.
+ * @private
+ * @param {RegExp} regex Regex to search with.
+ * @returns {Array} If `regex` uses flag g, an array of match strings or null. Without flag g, the
+ *   result of calling `regex.exec(this)`.
+ */
+    fixed.match = function (regex) {
+        if (!self.isRegExp(regex)) {
+            regex = new RegExp(regex); // Use native `RegExp`
+        } else if (regex.global) {
+            var result = nativ.match.apply(this, arguments);
+            regex.lastIndex = 0; // Fixes IE bug
+            return result;
+        }
+        return fixed.exec.call(regex, this);
+    };
+
+/**
+ * Adds support for `${n}` tokens for named and numbered backreferences in replacement text, and
+ * provides named backreferences to replacement functions as `arguments[0].name`. Also fixes
+ * browser bugs in replacement text syntax when performing a replacement using a nonregex search
+ * value, and the value of a replacement regex's `lastIndex` property during replacement iterations
+ * and upon completion. Note that this doesn't support SpiderMonkey's proprietary third (`flags`)
+ * argument. Calling `XRegExp.install('natives')` uses this to override the native method. Use via
+ * `XRegExp.replace` without overriding natives.
+ * @private
+ * @param {RegExp|String} search Search pattern to be replaced.
+ * @param {String|Function} replacement Replacement string or a function invoked to create it.
+ * @returns {String} New string with one or all matches replaced.
+ */
+    fixed.replace = function (search, replacement) {
+        var isRegex = self.isRegExp(search), captureNames, result, str, origLastIndex;
+        if (isRegex) {
+            if (search.xregexp) {
+                captureNames = search.xregexp.captureNames;
+            }
+            if (!search.global) {
+                origLastIndex = search.lastIndex;
+            }
+        } else {
+            search += "";
+        }
+        if (isType(replacement, "function")) {
+            result = nativ.replace.call(String(this), search, function () {
+                var args = arguments, i;
+                if (captureNames) {
+                    // Change the `arguments[0]` string primitive to a `String` object that can store properties
+                    args[0] = new String(args[0]);
+                    // Store named backreferences on the first argument
+                    for (i = 0; i < captureNames.length; ++i) {
+                        if (captureNames[i]) {
+                            args[0][captureNames[i]] = args[i + 1];
+                        }
+                    }
+                }
+                // Update `lastIndex` before calling `replacement`.
+                // Fixes IE, Chrome, Firefox, Safari bug (last tested IE 9, Chrome 17, Firefox 11, Safari 5.1)
+                if (isRegex && search.global) {
+                    search.lastIndex = args[args.length - 2] + args[0].length;
+                }
+                return replacement.apply(null, args);
+            });
+        } else {
+            str = String(this); // Ensure `args[args.length - 1]` will be a string when given nonstring `this`
+            result = nativ.replace.call(str, search, function () {
+                var args = arguments; // Keep this function's `arguments` available through closure
+                return nativ.replace.call(String(replacement), replacementToken, function ($0, $1, $2) {
+                    var n;
+                    // Named or numbered backreference with curly brackets
+                    if ($1) {
+                        /* XRegExp behavior for `${n}`:
+                         * 1. Backreference to numbered capture, where `n` is 1+ digits. `0`, `00`, etc. is the entire match.
+                         * 2. Backreference to named capture `n`, if it exists and is not a number overridden by numbered capture.
+                         * 3. Otherwise, it's an error.
+                         */
+                        n = +$1; // Type-convert; drop leading zeros
+                        if (n <= args.length - 3) {
+                            return args[n] || "";
+                        }
+                        n = captureNames ? lastIndexOf(captureNames, $1) : -1;
+                        if (n < 0) {
+                            throw new SyntaxError("backreference to undefined group " + $0);
+                        }
+                        return args[n + 1] || "";
+                    }
+                    // Else, special variable or numbered backreference (without curly brackets)
+                    if ($2 === "$") return "$";
+                    if ($2 === "&" || +$2 === 0) return args[0]; // $&, $0 (not followed by 1-9), $00
+                    if ($2 === "`") return args[args.length - 1].slice(0, args[args.length - 2]);
+                    if ($2 === "'") return args[args.length - 1].slice(args[args.length - 2] + args[0].length);
+                    // Else, numbered backreference (without curly brackets)
+                    $2 = +$2; // Type-convert; drop leading zero
+                    /* XRegExp behavior:
+                     * - Backreferences without curly brackets end after 1 or 2 digits. Use `${..}` for more digits.
+                     * - `$1` is an error if there are no capturing groups.
+                     * - `$10` is an error if there are less than 10 capturing groups. Use `${1}0` instead.
+                     * - `$01` is equivalent to `$1` if a capturing group exists, otherwise it's an error.
+                     * - `$0` (not followed by 1-9), `$00`, and `$&` are the entire match.
+                     * Native behavior, for comparison:
+                     * - Backreferences end after 1 or 2 digits. Cannot use backreference to capturing group 100+.
+                     * - `$1` is a literal `$1` if there are no capturing groups.
+                     * - `$10` is `$1` followed by a literal `0` if there are less than 10 capturing groups.
+                     * - `$01` is equivalent to `$1` if a capturing group exists, otherwise it's a literal `$01`.
+                     * - `$0` is a literal `$0`. `$&` is the entire match.
+                     */
+                    if (!isNaN($2)) {
+                        if ($2 > args.length - 3) {
+                            throw new SyntaxError("backreference to undefined group " + $0);
+                        }
+                        return args[$2] || "";
+                    }
+                    throw new SyntaxError("invalid token " + $0);
+                });
+            });
+        }
+        if (isRegex) {
+            if (search.global) {
+                search.lastIndex = 0; // Fixes IE, Safari bug (last tested IE 9, Safari 5.1)
+            } else {
+                search.lastIndex = origLastIndex; // Fixes IE, Opera bug (last tested IE 9, Opera 11.6)
+            }
+        }
+        return result;
+    };
+
+/**
+ * Fixes browser bugs in the native `String.prototype.split`. Calling `XRegExp.install('natives')`
+ * uses this to override the native method. Use via `XRegExp.split` without overriding natives.
+ * @private
+ * @param {RegExp|String} separator Regex or string to use for separating the string.
+ * @param {Number} [limit] Maximum number of items to include in the result array.
+ * @returns {Array} Array of substrings.
+ */
+    fixed.split = function (separator, limit) {
+        if (!self.isRegExp(separator)) {
+            return nativ.split.apply(this, arguments); // use faster native method
+        }
+        var str = String(this),
+            origLastIndex = separator.lastIndex,
+            output = [],
+            lastLastIndex = 0,
+            lastLength;
+        /* Values for `limit`, per the spec:
+         * If undefined: pow(2,32) - 1
+         * If 0, Infinity, or NaN: 0
+         * If positive number: limit = floor(limit); if (limit >= pow(2,32)) limit -= pow(2,32);
+         * If negative number: pow(2,32) - floor(abs(limit))
+         * If other: Type-convert, then use the above rules
+         */
+        limit = (limit === undef ? -1 : limit) >>> 0;
+        self.forEach(str, separator, function (match) {
+            if ((match.index + match[0].length) > lastLastIndex) { // != `if (match[0].length)`
+                output.push(str.slice(lastLastIndex, match.index));
+                if (match.length > 1 && match.index < str.length) {
+                    Array.prototype.push.apply(output, match.slice(1));
+                }
+                lastLength = match[0].length;
+                lastLastIndex = match.index + lastLength;
+            }
+        });
+        if (lastLastIndex === str.length) {
+            if (!nativ.test.call(separator, "") || lastLength) {
+                output.push("");
+            }
+        } else {
+            output.push(str.slice(lastLastIndex));
+        }
+        separator.lastIndex = origLastIndex;
+        return output.length > limit ? output.slice(0, limit) : output;
+    };
+
+/*--------------------------------------
+ *  Built-in tokens
+ *------------------------------------*/
+
+// Shortcut
+    add = addToken.on;
+
+/* Letter identity escapes that natively match literal characters: \p, \P, etc.
+ * Should be SyntaxErrors but are allowed in web reality. XRegExp makes them errors for cross-
+ * browser consistency and to reserve their syntax, but lets them be superseded by XRegExp addons.
+ */
+    add(/\\([ABCE-RTUVXYZaeg-mopqyz]|c(?![A-Za-z])|u(?![\dA-Fa-f]{4})|x(?![\dA-Fa-f]{2}))/,
+        function (match, scope) {
+            // \B is allowed in default scope only
+            if (match[1] === "B" && scope === defaultScope) {
+                return match[0];
+            }
+            throw new SyntaxError("invalid escape " + match[0]);
+        },
+        {scope: "all"});
+
+/* Empty character class: [] or [^]
+ * Fixes a critical cross-browser syntax inconsistency. Unless this is standardized (per the spec),
+ * regex syntax can't be accurately parsed because character class endings can't be determined.
+ */
+    add(/\[(\^?)]/,
+        function (match) {
+            // For cross-browser compatibility with ES3, convert [] to \b\B and [^] to [\s\S].
+            // (?!) should work like \b\B, but is unreliable in Firefox
+            return match[1] ? "[\\s\\S]" : "\\b\\B";
+        });
+
+/* Comment pattern: (?# )
+ * Inline comments are an alternative to the line comments allowed in free-spacing mode (flag x).
+ */
+    add(/(?:\(\?#[^)]*\))+/,
+        function (match) {
+            // Keep tokens separated unless the following token is a quantifier
+            return nativ.test.call(quantifier, match.input.slice(match.index + match[0].length)) ? "" : "(?:)";
+        });
+
+/* Named backreference: \k<name>
+ * Backreference names can use the characters A-Z, a-z, 0-9, _, and $ only.
+ */
+    add(/\\k<([\w$]+)>/,
+        function (match) {
+            var index = isNaN(match[1]) ? (lastIndexOf(this.captureNames, match[1]) + 1) : +match[1],
+                endIndex = match.index + match[0].length;
+            if (!index || index > this.captureNames.length) {
+                throw new SyntaxError("backreference to undefined group " + match[0]);
+            }
+            // Keep backreferences separate from subsequent literal numbers
+            return "\\" + index + (
+                endIndex === match.input.length || isNaN(match.input.charAt(endIndex)) ? "" : "(?:)"
+            );
+        });
+
+/* Whitespace and line comments, in free-spacing mode (aka extended mode, flag x) only.
+ */
+    add(/(?:\s+|#.*)+/,
+        function (match) {
+            // Keep tokens separated unless the following token is a quantifier
+            return nativ.test.call(quantifier, match.input.slice(match.index + match[0].length)) ? "" : "(?:)";
+        },
+        {
+            trigger: function () {
+                return this.hasFlag("x");
+            },
+            customFlags: "x"
+        });
+
+/* Dot, in dotall mode (aka singleline mode, flag s) only.
+ */
+    add(/\./,
+        function () {
+            return "[\\s\\S]";
+        },
+        {
+            trigger: function () {
+                return this.hasFlag("s");
+            },
+            customFlags: "s"
+        });
+
+/* Named capturing group; match the opening delimiter only: (?<name>
+ * Capture names can use the characters A-Z, a-z, 0-9, _, and $ only. Names can't be integers.
+ * Supports Python-style (?P<name> as an alternate syntax to avoid issues in recent Opera (which
+ * natively supports the Python-style syntax). Otherwise, XRegExp might treat numbered
+ * backreferences to Python-style named capture as octals.
+ */
+    add(/\(\?P?<([\w$]+)>/,
+        function (match) {
+            if (!isNaN(match[1])) {
+                // Avoid incorrect lookups, since named backreferences are added to match arrays
+                throw new SyntaxError("can't use integer as capture name " + match[0]);
+            }
+            this.captureNames.push(match[1]);
+            this.hasNamedCapture = true;
+            return "(";
+        });
+
+/* Numbered backreference or octal, plus any following digits: \0, \11, etc.
+ * Octals except \0 not followed by 0-9 and backreferences to unopened capture groups throw an
+ * error. Other matches are returned unaltered. IE <= 8 doesn't support backreferences greater than
+ * \99 in regex syntax.
+ */
+    add(/\\(\d+)/,
+        function (match, scope) {
+            if (!(scope === defaultScope && /^[1-9]/.test(match[1]) && +match[1] <= this.captureNames.length) &&
+                    match[1] !== "0") {
+                throw new SyntaxError("can't use octal escape or backreference to undefined group " + match[0]);
+            }
+            return match[0];
+        },
+        {scope: "all"});
+
+/* Capturing group; match the opening parenthesis only.
+ * Required for support of named capturing groups. Also adds explicit capture mode (flag n).
+ */
+    add(/\((?!\?)/,
+        function () {
+            if (this.hasFlag("n")) {
+                return "(?:";
+            }
+            this.captureNames.push(null);
+            return "(";
+        },
+        {customFlags: "n"});
+
+/*--------------------------------------
+ *  Expose XRegExp
+ *------------------------------------*/
+
+// For CommonJS enviroments
+    if (typeof exports !== "undefined") {
+        exports.XRegExp = self;
+    }
+
+    return self;
+
+}());
+
 //
 // Begin anonymous function. This is used to contain local scope variables without polutting global scope.
 //
-if (typeof(SyntaxHighlighter) == 'undefined') var SyntaxHighlighter = function() { 
+if (typeof(SyntaxHighlighter) == 'undefined') var SyntaxHighlighter = function() {
 
 // CommonJS
 if (typeof(require) != 'undefined' && typeof(XRegExp) == 'undefined')
 {
-	XRegExp = require('XRegExp').XRegExp;
+	XRegExp = require('xregexp').XRegExp;
 }
 
 // Shortcut object which will be assigned to the SyntaxHighlighter variable.
-// This is a shorthand for local reference in order to avoid long namespace 
+// This is a shorthand for local reference in order to avoid long namespace
 // references to SyntaxHighlighter.whatever...
 var sh = {
 	defaults : {
 		/** Additional CSS class names to be added to highlighter elements. */
 		'class-name' : '',
-		
+
 		/** First line number. */
 		'first-line' : 1,
-		
+
 		/**
 		 * Pads line numbers. Possible values are:
 		 *
@@ -28,96 +1309,90 @@ var sh = {
 		 *   [int] - length up to which pad line numbers.
 		 */
 		'pad-line-numbers' : false,
-		
+
 		/** Lines to highlight. */
 		'highlight' : null,
-		
+
 		/** Title to be displayed above the code block. */
 		'title' : null,
-		
+
 		/** Enables or disables smart tabs. */
 		'smart-tabs' : true,
-		
+
 		/** Gets or sets tab size. */
 		'tab-size' : 4,
-		
+
 		/** Enables or disables gutter. */
 		'gutter' : true,
-		
+
 		/** Enables or disables toolbar. */
 		'toolbar' : true,
-		
+
 		/** Enables quick code copy and paste from double click. */
 		'quick-code' : true,
-		
+
 		/** Forces code view to be collapsed. */
 		'collapse' : false,
-		
+
 		/** Enables or disables automatic links. */
 		'auto-links' : true,
-		
+
 		/** Gets or sets light mode. Equavalent to turning off gutter and toolbar. */
 		'light' : false,
 
 		'unindent' : true,
-		
+
 		'html-script' : false
 	},
-	
+
 	config : {
 		space : '&nbsp;',
-		
+
 		/** Enables use of <SCRIPT type="syntaxhighlighter" /> tags. */
 		useScriptTags : true,
-		
+
 		/** Blogger mode flag. */
 		bloggerMode : false,
-		
+
 		stripBrs : false,
-		
+
 		/** Name of the tag that SyntaxHighlighter will automatically look for. */
 		tagName : 'pre',
-		
+
 		strings : {
 			expandSource : 'expand source',
 			help : '?',
 			alert: 'SyntaxHighlighter\n\n',
 			noBrush : 'Can\'t find brush for: ',
 			brushNotHtmlScript : 'Brush wasn\'t configured for html-script option: ',
-			
+
 			// this is populated by the build script
-			aboutDialog : '@ABOUT@'
+			aboutDialog : '<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><title>About SyntaxHighlighter</title></head><body style=\"font-family:Geneva,Arial,Helvetica,sans-serif;background-color:#fff;color:#000;font-size:1em;text-align:center;\"><div style=\"text-align:center;margin-top:1.5em;\"><div style=\"font-size:xx-large;\">SyntaxHighlighter</div><div style=\"font-size:.75em;margin-bottom:3em;\"><div>version 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)</div><div><a href=\"http://alexgorbatchev.com/SyntaxHighlighter\" target=\"_blank\" style=\"color:#005896\">http://alexgorbatchev.com/SyntaxHighlighter</a></div><div>JavaScript code syntax highlighter.</div><div>Copyright 2004-2013 Alex Gorbatchev.</div></div><div>If you like this script, please <a href=\"https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2930402\" style=\"color:#005896\">donate</a> to <br/>keep development active!</div></div></body></html>'
 		}
 	},
-	
+
 	/** Internal 'global' variables. */
 	vars : {
 		discoveredBrushes : null,
 		highlighters : {}
 	},
-	
+
 	/** This object is populated by user included external brush files. */
 	brushes : {},
 
 	/** Common regular expressions. */
 	regexLib : {
-		multiLineCComments			: /\/\*[\s\S]*?\*\//gm,
+		multiLineCComments			: XRegExp('/\\*.*?\\*/', 'gs'),
 		singleLineCComments			: /\/\/.*$/gm,
 		singleLinePerlComments		: /#.*$/gm,
 		doubleQuotedString			: /"([^\\"\n]|\\.)*"/g,
 		singleQuotedString			: /'([^\\'\n]|\\.)*'/g,
-		multiLineDoubleQuotedString	: new XRegExp('"([^\\\\"]|\\\\.)*"', 'gs'),
-		multiLineSingleQuotedString	: new XRegExp("'([^\\\\']|\\\\.)*'", 'gs'),
-		xmlComments					: /(&lt;|<)!--[\s\S]*?--(&gt;|>)/gm,
+		multiLineDoubleQuotedString	: XRegExp('"([^\\\\"]|\\\\.)*"', 'gs'),
+		multiLineSingleQuotedString	: XRegExp("'([^\\\\']|\\\\.)*'", 'gs'),
+		xmlComments					: XRegExp('(&lt;|<)!--.*?--(&gt;|>)', 'gs'),
 		url							: /\w+:\/\/[\w-.\/?%&=:@;#]*/g,
-		
-		/** <?= ?> tags. */
 		phpScriptTags 				: { left: /(&lt;|<)\?(?:=|php)?/g, right: /\?(&gt;|>)/g, 'eof' : true },
-		
-		/** <%= %> tags. */
 		aspScriptTags				: { left: /(&lt;|<)%=?/g, right: /%(&gt;|>)/g },
-		
-		/** <script> tags. */
 		scriptScriptTags			: { left: /(&lt;|<)\s*script.*?(&gt;|>)/gi, right: /(&lt;|<)\/\s*script\s*(&gt;|>)/gi }
 	},
 
@@ -133,20 +1408,22 @@ var sh = {
 				items = sh.toolbar.items,
 				list = items.list
 				;
-			
+
 			function defaultGetHtml(highlighter, name)
 			{
 				return sh.toolbar.getButtonHtml(highlighter, name, sh.config.strings[name]);
-			};
-			
-			for (var i = 0; i < list.length; i++)
+			}
+
+			for (var i = 0, l = list.length; i < l; i++)
+			{
 				html += (items[list[i]].getHtml || defaultGetHtml)(highlighter, list[i]);
-			
+			}
+
 			html += '</div>';
-			
+
 			return html;
 		},
-		
+
 		/**
 		 * Generates HTML markup for a regular button in the toolbar.
 		 * @param {Highlighter} highlighter Highlighter instance.
@@ -162,7 +1439,7 @@ var sh = {
 				+ '">' + label + '</a></span>'
 				;
 		},
-		
+
 		/**
 		 * Event handler for a toolbar anchor.
 		 */
@@ -179,12 +1456,12 @@ var sh = {
 					;
 
 				return match ? match[1] : null;
-			};
-			
+			}
+
 			var highlighter = getHighlighterById(findParentElement(target, '.syntaxhighlighter').id),
 				commandName = getValue('command')
 				;
-			
+
 			// execute the toolbar command
 			if (highlighter && commandName)
 				sh.toolbar.items[commandName].execute(highlighter);
@@ -192,7 +1469,7 @@ var sh = {
 			// disable default A click behaviour
 			e.preventDefault();
 		},
-		
+
 		/** Collection of toolbar items. */
 		items : {
 			// Ordered lis of items in the toolbar. Can't expect `for (var n in items)` to be consistent.
@@ -203,11 +1480,11 @@ var sh = {
 				{
 					if (highlighter.getParam('collapse') != true)
 						return '';
-						
+
 					var title = highlighter.getParam('title');
 					return sh.toolbar.getButtonHtml(highlighter, 'expandSource', title ? title : sh.config.strings.expandSource);
 				},
-			
+
 				execute: function(highlighter)
 				{
 					var div = getHighlighterDivById(highlighter.id);
@@ -218,11 +1495,11 @@ var sh = {
 			/** Command to display the about dialog window. */
 			help: {
 				execute: function(highlighter)
-				{	
+				{
 					var wnd = popup('', '_blank', 500, 250, 'scrollbars=0'),
 						doc = wnd.document
 						;
-					
+
 					doc.write(sh.config.strings.aboutDialog);
 					doc.close();
 					wnd.focus();
@@ -234,18 +1511,18 @@ var sh = {
 	/**
 	 * Finds all elements on the page which should be processes by SyntaxHighlighter.
 	 *
-	 * @param {Object} globalParams		Optional parameters which override element's 
+	 * @param {Object} globalParams		Optional parameters which override element's
 	 * 									parameters. Only used if element is specified.
-	 * 
+	 *
 	 * @param {Object} element	Optional element to highlight. If none is
-	 * 							provided, all elements in the current document 
+	 * 							provided, all elements in the current document
 	 * 							are returned which qualify.
 	 *
 	 * @return {Array}	Returns list of <code>{ target: DOMElement, params: Object }</code> objects.
 	 */
 	findElements: function(globalParams, element)
 	{
-		var elements = element ? [element] : toArray(document.getElementsByTagName(sh.config.tagName)), 
+		var elements = element ? [element] : toArray(document.getElementsByTagName(sh.config.tagName)),
 			conf = sh.config,
 			result = []
 			;
@@ -254,49 +1531,49 @@ var sh = {
 		if (conf.useScriptTags)
 			elements = elements.concat(getSyntaxHighlighterScriptTags());
 
-		if (elements.length === 0) 
+		if (elements.length === 0)
 			return result;
-	
-		for (var i = 0; i < elements.length; i++) 
+
+		for (var i = 0, l = elements.length; i < l; i++)
 		{
 			var item = {
-				target: elements[i], 
+				target: elements[i],
 				// local params take precedence over globals
 				params: merge(globalParams, parseParams(elements[i].className))
 			};
 
 			if (item.params['brush'] == null)
 				continue;
-				
+
 			result.push(item);
 		}
-		
+
 		return result;
 	},
 
 	/**
-	 * Shorthand to highlight all elements on the page that are marked as 
+	 * Shorthand to highlight all elements on the page that are marked as
 	 * SyntaxHighlighter source code.
-	 * 
-	 * @param {Object} globalParams		Optional parameters which override element's 
+	 *
+	 * @param {Object} globalParams		Optional parameters which override element's
 	 * 									parameters. Only used if element is specified.
-	 * 
+	 *
 	 * @param {Object} element	Optional element to highlight. If none is
-	 * 							provided, all elements in the current document 
+	 * 							provided, all elements in the current document
 	 * 							are highlighted.
-	 */ 
+	 */
 	highlight: function(globalParams, element)
 	{
 		var elements = this.findElements(globalParams, element),
-			propertyName = 'innerHTML', 
+			propertyName = 'innerHTML',
 			highlighter = null,
 			conf = sh.config
 			;
 
-		if (elements.length === 0) 
+		if (elements.length === 0)
 			return;
-	
-		for (var i = 0; i < elements.length; i++) 
+
+		for (var i = 0, l = elements.length; i < l; i++)
 		{
 			var element = elements[i],
 				target = element.target,
@@ -309,7 +1586,7 @@ var sh = {
 				continue;
 
 			// Instantiate a brush
-			if (params['html-script'] == 'true' || sh.defaults['html-script'] == true) 
+			if (params['html-script'] == 'true' || sh.defaults['html-script'] == true)
 			{
 				highlighter = new sh.HtmlScript(brushName);
 				brushName = 'htmlscript';
@@ -317,31 +1594,31 @@ var sh = {
 			else
 			{
 				var brush = findBrush(brushName);
-				
+
 				if (brush)
 					highlighter = new brush();
 				else
 					continue;
 			}
-			
+
 			code = target[propertyName];
-			
+
 			// remove CDATA from <SCRIPT/> tags if it's present
 			if (conf.useScriptTags)
 				code = stripCData(code);
-				
+
 			// Inject title if the attribute is present
 			if ((target.title || '') != '')
 				params.title = target.title;
-				
+
 			params['brush'] = brushName;
 			highlighter.init(params);
 			element = highlighter.getDiv(code);
-			
+
 			// carry over ID
 			if ((target.id || '') != '')
 				element.id = target.id;
-			
+
 			target.parentNode.replaceChild(element, target);
 		}
 	},
@@ -393,7 +1670,7 @@ function removeClass(target, className)
 };
 
 /**
- * Converts the source to array object. Mostly used for function arguments and 
+ * Converts the source to array object. Mostly used for function arguments and
  * lists returned by getElementsByTagName() which aren't Array objects.
  * @param {List} source Source list.
  * @return {Array} Returns array.
@@ -401,10 +1678,10 @@ function removeClass(target, className)
 function toArray(source)
 {
 	var result = [];
-	
-	for (var i = 0; i < source.length; i++) 
+
+	for (var i = 0, l = source.length; i < l; i++)
 		result.push(source[i]);
-		
+
 	return result;
 };
 
@@ -471,7 +1748,7 @@ function findElement(target, search, reverse /* optional */)
 {
 	if (target == null)
 		return null;
-		
+
 	var nodes			= reverse != true ? target.childNodes : [ target.parentNode ],
 		propertyToFind	= { '#' : 'id', '.' : 'className' }[search.substr(0, 1)] || 'nodeName',
 		expectedValue,
@@ -482,14 +1759,14 @@ function findElement(target, search, reverse /* optional */)
 		? search.substr(1)
 		: search.toUpperCase()
 		;
-		
+
 	// main return of the found node
 	if ((target[propertyToFind] || '').indexOf(expectedValue) != -1)
 		return target;
-	
-	for (var i = 0; nodes && i < nodes.length && found == null; i++)
+
+	for (var i = 0, l = nodes.length; nodes && i < l && found == null; i++)
 		found = findElement(nodes[i], search, reverse);
-	
+
 	return found;
 };
 
@@ -516,10 +1793,10 @@ function indexOf(array, searchElement, fromIndex)
 {
 	fromIndex = Math.max(fromIndex || 0, 0);
 
-	for (var i = fromIndex; i < array.length; i++)
+	for (var i = fromIndex, l = array.length; i < l; i++)
 		if(array[i] == searchElement)
 			return i;
-	
+
 	return -1;
 };
 
@@ -542,12 +1819,12 @@ function merge(obj1, obj2)
 {
 	var result = {}, name;
 
-	for (name in obj1) 
+	for (name in obj1)
 		result[name] = obj1[name];
-	
-	for (name in obj2) 
+
+	for (name in obj2)
 		result[name] = obj2[name];
-		
+
 	return result;
 };
 
@@ -576,8 +1853,8 @@ function popup(url, name, width, height, options)
 	var x = (screen.width - width) / 2,
 		y = (screen.height - height) / 2
 		;
-		
-	options +=	', left=' + x + 
+
+	options +=	', left=' + x +
 				', top=' + y +
 				', width=' + width +
 				', height=' + height
@@ -600,7 +1877,7 @@ function attachEvent(obj, type, func, scope)
 	function handler(e)
 	{
 		e = e || window.event;
-		
+
 		if (!e.target)
 		{
 			e.target = e.srcElement;
@@ -609,15 +1886,15 @@ function attachEvent(obj, type, func, scope)
 				this.returnValue = false;
 			};
 		}
-			
+
 		func.call(scope || window, e);
 	};
-	
-	if (obj.attachEvent) 
+
+	if (obj.attachEvent)
 	{
 		obj.attachEvent('on' + type, handler);
 	}
-	else 
+	else
 	{
 		obj.addEventListener(type, handler, false);
 	}
@@ -644,36 +1921,36 @@ function findBrush(alias, showAlert)
 	var brushes = sh.vars.discoveredBrushes,
 		result = null
 		;
-	
-	if (brushes == null) 
+
+	if (brushes == null)
 	{
 		brushes = {};
-		
+
 		// Find all brushes
-		for (var brush in sh.brushes) 
+		for (var brush in sh.brushes)
 		{
 			var info = sh.brushes[brush],
 				aliases = info.aliases
 				;
-			
-			if (aliases == null) 
+
+			if (aliases == null)
 				continue;
-			
+
 			// keep the brush name
 			info.brushName = brush.toLowerCase();
-			
-			for (var i = 0; i < aliases.length; i++) 
+
+			for (var i = 0, l = aliases.length; i < l; i++)
 				brushes[aliases[i]] = brush;
 		}
-		
+
 		sh.vars.discoveredBrushes = brushes;
 	}
-	
+
 	result = sh.brushes[brushes[alias]];
 
 	if (result == null && showAlert)
 		alert(sh.config.strings.noBrush + alias);
-	
+
 	return result;
 };
 
@@ -685,10 +1962,10 @@ function findBrush(alias, showAlert)
 function eachLine(str, callback)
 {
 	var lines = splitLines(str);
-	
-	for (var i = 0; i < lines.length; i++)
+
+	for (var i = 0, l = lines.length; i < l; i++)
 		lines[i] = callback(lines[i], i);
-		
+
 	// include \r to enable copy-paste on windows (ie8) without getting everything on one line
 	return lines.join('\r\n');
 };
@@ -696,7 +1973,7 @@ function eachLine(str, callback)
 /**
  * This is a special trim which only removes first and last empty lines
  * and doesn't affect valid leading space on the first line.
- * 
+ *
  * @param {String} str   Input string
  * @return {String}      Returns string without empty first and last lines.
  */
@@ -707,29 +1984,30 @@ function trimFirstAndLastLines(str)
 
 /**
  * Parses key/value pairs into hash object.
- * 
+ *
  * Understands the following formats:
  * - name: word;
  * - name: [word, word];
  * - name: "string";
  * - name: 'string';
- * 
+ *
  * For example:
  *   name1: value; name2: [value, value]; name3: 'value'
- *   
+ *
  * @param {String} str    Input string.
  * @return {Object}       Returns deserialized object.
  */
 function parseParams(str)
 {
-	var match, 
+	var match,
 		result = {},
-		arrayRegex = new XRegExp("^\\[(?<values>(.*?))\\]$"),
-		regex = new XRegExp(
+		arrayRegex = XRegExp("^\\[(?<values>(.*?))\\]$"),
+		pos = 0,
+		regex = XRegExp(
 			"(?<name>[\\w-]+)" +
 			"\\s*:\\s*" +
 			"(?<value>" +
-				"[\\w-%#]+|" +		// word
+				"[\\w%#-]+|" +		// word
 				"\\[.*?\\]|" +		// [] array
 				'".*?"|' +			// "" string
 				"'.*?'" +			// '' string
@@ -738,35 +2016,36 @@ function parseParams(str)
 		)
 		;
 
-	while ((match = regex.exec(str)) != null) 
+	while ((match = XRegExp.exec(str, regex, pos)) != null)
 	{
 		var value = match.value
 			.replace(/^['"]|['"]$/g, '') // strip quotes from end of strings
 			;
-		
+
 		// try to parse array value
 		if (value != null && arrayRegex.test(value))
 		{
-			var m = arrayRegex.exec(value);
+			var m = XRegExp.exec(value, arrayRegex);
 			value = m.values.length > 0 ? m.values.split(/\s*,\s*/) : [];
 		}
-		
+
 		result[match.name] = value;
+		pos = match.index + match[0].length;
 	}
-	
+
 	return result;
 };
 
 /**
  * Wraps each line of the string into <code/> tag with given style applied to it.
- * 
+ *
  * @param {String} str   Input string.
  * @param {String} css   Style name to apply to the string.
  * @return {String}      Returns input string with each line surrounded by <span/> tag.
  */
 function wrapLinesWithCode(str, css)
 {
-	if (str == null || str.length == 0 || str == '\n') 
+	if (str == null || str.length == 0 || str == '\n')
 		return str;
 
 	str = str.replace(/</g, '&lt;');
@@ -775,32 +2054,32 @@ function wrapLinesWithCode(str, css)
 	str = str.replace(/ {2,}/g, function(m)
 	{
 		var spaces = '';
-		
-		for (var i = 0; i < m.length - 1; i++)
+
+		for (var i = 0, l = m.length; i < l - 1; i++)
 			spaces += sh.config.space;
-		
+
 		return spaces + ' ';
 	});
 
 	// Split each line and apply <span class="...">...</span> to them so that
 	// leading spaces aren't included.
-	if (css != null) 
+	if (css != null)
 		str = eachLine(str, function(line)
 		{
-			if (line.length == 0) 
+			if (line.length == 0)
 				return '';
-			
+
 			var spaces = '';
-			
+
 			line = line.replace(/^(&nbsp;| )+/, function(s)
 			{
 				spaces = s;
 				return '';
 			});
-			
-			if (line.length == 0) 
+
+			if (line.length == 0)
 				return spaces;
-			
+
 			return spaces + '<code class="' + css + '">' + line + '</code>';
 		});
 
@@ -809,7 +2088,7 @@ function wrapLinesWithCode(str, css)
 
 /**
  * Pads number with zeros until it's length is the same as given length.
- * 
+ *
  * @param {Number} number	Number to pad.
  * @param {Number} length	Max string length with.
  * @return {String}			Returns a string padded with proper amount of '0'.
@@ -817,16 +2096,16 @@ function wrapLinesWithCode(str, css)
 function padNumber(number, length)
 {
 	var result = number.toString();
-	
+
 	while (result.length < length)
 		result = '0' + result;
-	
+
 	return result;
 };
 
 /**
  * Replaces tabs with spaces.
- * 
+ *
  * @param {String} code		Source code.
  * @param {Number} tabSize	Size of the tab.
  * @return {String}			Returns code with all tabs replaces by spaces.
@@ -834,7 +2113,7 @@ function padNumber(number, length)
 function processTabs(code, tabSize)
 {
 	var tab = '';
-	
+
 	for (var i = 0; i < tabSize; i++)
 		tab += ' ';
 
@@ -843,7 +2122,7 @@ function processTabs(code, tabSize)
 
 /**
  * Replaces tabs with smart spaces.
- * 
+ *
  * @param {String} code    Code to fix the tabs in.
  * @param {Number} tabSize Number of spaces in a column.
  * @return {String}        Returns code with all tabs replaces with roper amount of spaces.
@@ -854,12 +2133,12 @@ function processSmartTabs(code, tabSize)
 		tab = '\t',
 		spaces = ''
 		;
-	
-	// Create a string with 1000 spaces to copy spaces from... 
+
+	// Create a string with 1000 spaces to copy spaces from...
 	// It's assumed that there would be no indentation longer than that.
-	for (var i = 0; i < 50; i++) 
+	for (var i = 0; i < 50; i++)
 		spaces += '                    '; // 20 spaces * 50
-			
+
 	// This function inserts specified amount of spaces in the string
 	// where a tab is while removing that given tab.
 	function insertSpaces(line, pos, count)
@@ -873,12 +2152,12 @@ function processSmartTabs(code, tabSize)
 	// Go through all the lines and do the 'smart tabs' magic.
 	code = eachLine(code, function(line)
 	{
-		if (line.indexOf(tab) == -1) 
+		if (line.indexOf(tab) == -1)
 			return line;
-		
+
 		var pos = 0;
-		
-		while ((pos = line.indexOf(tab)) != -1) 
+
+		while ((pos = line.indexOf(tab)) != -1)
 		{
 			// This is pretty much all there is to the 'smart tabs' logic.
 			// Based on the position within the line and size of a tab,
@@ -886,10 +2165,10 @@ function processSmartTabs(code, tabSize)
 			var spaces = tabSize - pos % tabSize;
 			line = insertSpaces(line, pos, spaces);
 		}
-		
+
 		return line;
 	});
-	
+
 	return code;
 };
 
@@ -899,19 +2178,19 @@ function processSmartTabs(code, tabSize)
 function fixInputString(str)
 {
 	var br = /<br\s*\/?>|&lt;br\s*\/?&gt;/gi;
-	
+
 	if (sh.config.bloggerMode == true)
 		str = str.replace(br, '\n');
 
 	if (sh.config.stripBrs == true)
 		str = str.replace(br, '');
-		
+
 	return str;
 };
 
 /**
  * Removes all white space at the begining and end of a string.
- * 
+ *
  * @param {String} str   String to trim.
  * @return {String}      Returns string without leading and following white space characters.
  */
@@ -932,37 +2211,37 @@ function unindent(str)
 		regex = /^\s*/,
 		min = 1000
 		;
-	
+
 	// go through every line and check for common number of indents
-	for (var i = 0; i < lines.length && min > 0; i++) 
+	for (var i = 0, l = lines.length; i < l && min > 0; i++)
 	{
 		var line = lines[i];
-		
-		if (trim(line).length == 0) 
+
+		if (trim(line).length == 0)
 			continue;
-		
+
 		var matches = regex.exec(line);
-		
+
 		// In the event that just one line doesn't have leading white space
 		// we can't unindent anything, so bail completely.
-		if (matches == null) 
+		if (matches == null)
 			return str;
-			
+
 		min = Math.min(matches[0].length, min);
 	}
-	
+
 	// trim minimum common number of white space from the begining of every line
-	if (min > 0) 
-		for (var i = 0; i < lines.length; i++) 
+	if (min > 0)
+		for (var i = 0, l = lines.length; i < l; i++)
 			lines[i] = lines[i].substr(min);
-	
+
 	return lines.join('\n');
 };
 
 /**
  * Callback method for Array.sort() which sorts matches by
  * index position and then by length.
- * 
+ *
  * @param {Match} m1	Left object.
  * @param {Match} m2    Right object.
  * @return {Number}     Returns -1, 0 or -1 as a comparison result.
@@ -982,41 +2261,43 @@ function matchesSortCallback(m1, m2)
 		else if(m1.length > m2.length)
 			return 1;
 	}
-	
+
 	return 0;
 };
 
 /**
  * Executes given regular expression on provided code and returns all
  * matches that are found.
- * 
+ *
  * @param {String} code    Code to execute regular expression on.
  * @param {Object} regex   Regular expression item info from <code>regexList</code> collection.
  * @return {Array}         Returns a list of Match objects.
- */ 
+ */
 function getMatches(code, regexInfo)
 {
 	function defaultAdd(match, regexInfo)
 	{
 		return match[0];
 	};
-	
+
 	var index = 0,
 		match = null,
 		matches = [],
 		func = regexInfo.func ? regexInfo.func : defaultAdd
+		pos = 0
 		;
-	
-	while((match = regexInfo.regex.exec(code)) != null)
+
+	while((match = XRegExp.exec(code, regexInfo.regex, pos)) != null)
 	{
 		var resultMatch = func(match, regexInfo);
-		
+
 		if (typeof(resultMatch) == 'string')
 			resultMatch = [new sh.Match(resultMatch, match.index, regexInfo.css)];
 
 		matches = matches.concat(resultMatch);
+		pos = match.index + match[0].length;
 	}
-	
+
 	return matches;
 };
 
@@ -1028,23 +2309,23 @@ function getMatches(code, regexInfo)
 function processUrls(code)
 {
 	var gt = /(.*)((&gt;|&lt;).*)/;
-	
+
 	return code.replace(sh.regexLib.url, function(m)
 	{
 		var suffix = '',
 			match = null
 			;
-		
+
 		// We include &lt; and &gt; in the URL for the common cases like <http://google.com>
 		// The problem is that they get transformed into &lt;http://google.com&gt;
 		// Where as &gt; easily looks like part of the URL string.
-	
+
 		if (match = gt.exec(m))
 		{
 			m = match[1];
 			suffix = match[2];
 		}
-		
+
 		return '<a href="' + m + '">' + m + '</a>' + suffix;
 	});
 };
@@ -1058,11 +2339,11 @@ function getSyntaxHighlighterScriptTags()
 	var tags = document.getElementsByTagName('script'),
 		result = []
 		;
-	
-	for (var i = 0; i < tags.length; i++)
+
+	for (var i = 0, l = tags.length; i < l; i++)
 		if (tags[i].type == 'syntaxhighlighter')
 			result.push(tags[i]);
-			
+
 	return result;
 };
 
@@ -1082,21 +2363,21 @@ function stripCData(original)
 		leftLength = left.length,
 		rightLength = right.length
 		;
-	
+
 	if (copy.indexOf(left) == 0)
 	{
 		copy = copy.substring(leftLength);
 		changed = true;
 	}
-	
+
 	var copyLength = copy.length;
-	
+
 	if (copy.indexOf(right) == copyLength - rightLength)
 	{
 		copy = copy.substring(0, copyLength - rightLength);
 		changed = true;
 	}
-	
+
 	return changed ? copy : original;
 };
 
@@ -1117,7 +2398,7 @@ function quickCodeHandler(e)
 		return;
 
 	highlighter = getHighlighterById(highlighterDiv.id);
-	
+
 	// add source class name
 	addClass(highlighterDiv, 'source');
 
@@ -1126,21 +2407,24 @@ function quickCodeHandler(e)
 	var lines = container.childNodes,
 		code = []
 		;
-	
-	for (var i = 0; i < lines.length; i++)
+
+	for (var i = 0, l = lines.length; i < l; i++)
 		code.push(lines[i].innerText || lines[i].textContent);
-	
+
 	// using \r instead of \r or \r\n makes this work equally well on IE, FF and Webkit
 	code = code.join('\r');
-	
+
+    // For Webkit browsers, replace nbsp with a breaking space
+    code = code.replace(/\u00a0/g, " ");
+
 	// inject <textarea/> tag
 	textarea.appendChild(document.createTextNode(code));
 	container.appendChild(textarea);
-	
+
 	// preselect all text
 	textarea.focus();
 	textarea.select();
-	
+
 	// set up handler for lost focus
 	attachEvent(textarea, 'blur', function(e)
 	{
@@ -1168,7 +2452,7 @@ sh.Match.prototype.toString = function()
 
 /**
  * Simulates HTML code with a scripting language embedded.
- * 
+ *
  * @param {String} scriptBrushName Brush name of the scripting language.
  */
 sh.HtmlScript = function(scriptBrushName)
@@ -1183,36 +2467,36 @@ sh.HtmlScript = function(scriptBrushName)
 
 	if (brushClass == null)
 		return;
-	
+
 	scriptBrush = new brushClass();
-	
-	for(var i = 0; i < methodsToExpose.length; i++)
+
+	for(var i = 0, l = methodsToExpose.length; i < l; i++)
 		// make a closure so we don't lose the name after i changes
 		(function() {
 			var name = methodsToExpose[i];
-			
+
 			ref[name] = function()
 			{
 				return xmlBrush[name].apply(xmlBrush, arguments);
 			};
 		})();
-	
+
 	if (scriptBrush.htmlScript == null)
 	{
 		alert(sh.config.strings.brushNotHtmlScript + scriptBrushName);
 		return;
 	}
-	
+
 	xmlBrush.regexList.push(
 		{ regex: scriptBrush.htmlScript.code, func: process }
 	);
-	
+
 	function offsetMatches(matches, offset)
 	{
-		for (var j = 0; j < matches.length; j++) 
+		for (var j = 0, l = matches.length; j < l; j++)
 			matches[j].index += offset;
 	}
-	
+
 	function process(match, info)
 	{
 		var code = match.code,
@@ -1224,13 +2508,13 @@ sh.HtmlScript = function(scriptBrushName)
 			;
 
 		// add all matches from the code
-		for (var i = 0; i < regexList.length; i++)
+		for (var i = 0, l = regexList.length; i < l; i++)
 		{
 			result = getMatches(code, regexList[i]);
 			offsetMatches(result, offset);
 			matches = matches.concat(result);
 		}
-		
+
 		// add left script bracket
 		if (htmlScript.left != null && match.left != null)
 		{
@@ -1238,7 +2522,7 @@ sh.HtmlScript = function(scriptBrushName)
 			offsetMatches(result, match.index);
 			matches = matches.concat(result);
 		}
-		
+
 		// add right script bracket
 		if (htmlScript.right != null && match.right != null)
 		{
@@ -1246,10 +2530,10 @@ sh.HtmlScript = function(scriptBrushName)
 			offsetMatches(result, match.index + match[0].lastIndexOf(match.right));
 			matches = matches.concat(result);
 		}
-		
-		for (var j = 0; j < matches.length; j++)
+
+		for (var j = 0, l = matches.length; j < l; j++)
 			matches[j].brushName = brushClass.brushName;
-			
+
 		return matches;
 	}
 };
@@ -1275,7 +2559,7 @@ sh.Highlighter.prototype = {
 		var result = this.params[name];
 		return toBoolean(result == null ? defaultValue : result);
 	},
-	
+
 	/**
 	 * Shortcut to document.createElement().
 	 * @param {String} name		Name of the element to create (DIV, A, etc).
@@ -1285,7 +2569,7 @@ sh.Highlighter.prototype = {
 	{
 		return document.createElement(name);
 	},
-	
+
 	/**
 	 * Applies all regular expression to the code and stores all found
 	 * matches in the `this.matches` array.
@@ -1296,52 +2580,52 @@ sh.Highlighter.prototype = {
 	findMatches: function(regexList, code)
 	{
 		var result = [];
-		
+
 		if (regexList != null)
-			for (var i = 0; i < regexList.length; i++) 
+			for (var i = 0, l = regexList.length; i < l; i++)
 				// BUG: length returns len+1 for array if methods added to prototype chain (oising@gmail.com)
 				if (typeof (regexList[i]) == "object")
 					result = result.concat(getMatches(code, regexList[i]));
-		
+
 		// sort and remove nested the matches
 		return this.removeNestedMatches(result.sort(matchesSortCallback));
 	},
-	
+
 	/**
-	 * Checks to see if any of the matches are inside of other matches. 
-	 * This process would get rid of highligted strings inside comments, 
+	 * Checks to see if any of the matches are inside of other matches.
+	 * This process would get rid of highligted strings inside comments,
 	 * keywords inside strings and so on.
 	 */
 	removeNestedMatches: function(matches)
 	{
 		// Optimized by Jose Prado (http://joseprado.com)
-		for (var i = 0; i < matches.length; i++) 
-		{ 
+		for (var i = 0, l = matches.length; i < l; i++)
+		{
 			if (matches[i] === null)
 				continue;
-			
+
 			var itemI = matches[i],
 				itemIEndPos = itemI.index + itemI.length
 				;
-			
-			for (var j = i + 1; j < matches.length && matches[i] !== null; j++) 
+
+			for (var j = i + 1, l = matches.length; j < l && matches[i] !== null; j++)
 			{
 				var itemJ = matches[j];
-				
-				if (itemJ === null) 
+
+				if (itemJ === null)
 					continue;
-				else if (itemJ.index > itemIEndPos) 
+				else if (itemJ.index > itemIEndPos)
 					break;
 				else if (itemJ.index == itemI.index && itemJ.length > itemI.length)
 					matches[i] = null;
-				else if (itemJ.index >= itemI.index && itemJ.index < itemIEndPos) 
+				else if (itemJ.index >= itemI.index && itemJ.index < itemIEndPos)
 					matches[j] = null;
 			}
 		}
-		
+
 		return matches;
 	},
-	
+
 	/**
 	 * Creates an array containing integer line numbers starting from the 'first-line' param.
 	 * @return {Array} Returns array of integers.
@@ -1351,28 +2635,28 @@ sh.Highlighter.prototype = {
 		var lines = [],
 			firstLine = parseInt(this.getParam('first-line'))
 			;
-		
+
 		eachLine(code, function(line, index)
 		{
 			lines.push(index + firstLine);
 		});
-		
+
 		return lines;
 	},
-	
+
 	/**
 	 * Determines if specified line number is in the highlighted list.
 	 */
 	isLineHighlighted: function(lineNumber)
 	{
 		var list = this.getParam('highlight', []);
-		
-		if (typeof(list) != 'object' && list.push == null) 
+
+		if (typeof(list) != 'object' && list.push == null)
 			list = [ list ];
-		
+
 		return indexOf(list, lineNumber.toString()) != -1;
 	},
-	
+
 	/**
 	 * Generates HTML markup for a single line of code while determining alternating line style.
 	 * @param {Integer} lineNumber	Line number.
@@ -1387,16 +2671,16 @@ sh.Highlighter.prototype = {
 			'index' + lineIndex,
 			'alt' + (lineNumber % 2 == 0 ? 1 : 2).toString()
 		];
-		
+
 		if (this.isLineHighlighted(lineNumber))
 		 	classes.push('highlighted');
-		
+
 		if (lineNumber == 0)
 			classes.push('break');
-			
+
 		return '<div class="' + classes.join(' ') + '">' + code + '</div>';
 	},
-	
+
 	/**
 	 * Generates HTML markup for line number column.
 	 * @param {String} code			Complete code HTML markup.
@@ -1410,24 +2694,24 @@ sh.Highlighter.prototype = {
 			firstLine = parseInt(this.getParam('first-line')),
 			pad = this.getParam('pad-line-numbers')
 			;
-		
+
 		if (pad == true)
 			pad = (firstLine + count - 1).toString().length;
 		else if (isNaN(pad) == true)
 			pad = 0;
-			
+
 		for (var i = 0; i < count; i++)
 		{
 			var lineNumber = lineNumbers ? lineNumbers[i] : firstLine + i,
 				code = lineNumber == 0 ? sh.config.space : padNumber(lineNumber, pad)
 				;
-				
+
 			html += this.getLineHtml(i, lineNumber, code);
 		}
-		
+
 		return html;
 	},
-	
+
 	/**
 	 * Splits block of text into individual DIV lines.
 	 * @param {String} code			Code to highlight.
@@ -1437,7 +2721,7 @@ sh.Highlighter.prototype = {
 	getCodeLinesHtml: function(html, lineNumbers)
 	{
 		html = trim(html);
-		
+
 		var lines = splitLines(html),
 			padLength = this.getParam('pad-line-numbers'),
 			firstLine = parseInt(this.getParam('first-line')),
@@ -1445,7 +2729,7 @@ sh.Highlighter.prototype = {
 			brushName = this.getParam('brush')
 			;
 
-		for (var i = 0; i < lines.length; i++)
+		for (var i = 0, l = lines.length; i < l; i++)
 		{
 			var line = lines[i],
 				indent = /^(&nbsp;|\s)+/.exec(line),
@@ -1461,20 +2745,20 @@ sh.Highlighter.prototype = {
 			}
 
 			line = trim(line);
-			
+
 			if (line.length == 0)
 				line = sh.config.space;
-			
+
 			html += this.getLineHtml(
 				i,
-				lineNumber, 
+				lineNumber,
 				(spaces != null ? '<code class="' + brushName + ' spaces">' + spaces + '</code>' : '') + line
 			);
 		}
-		
+
 		return html;
 	},
-	
+
 	/**
 	 * Returns HTML for the table title or empty string if title is null.
 	 */
@@ -1482,7 +2766,7 @@ sh.Highlighter.prototype = {
 	{
 		return title ? '<caption>' + title + '</caption>' : '';
 	},
-	
+
 	/**
 	 * Finds all matches in the source code.
 	 * @param {String} code		Source code to process matches in.
@@ -1491,30 +2775,30 @@ sh.Highlighter.prototype = {
 	 */
 	getMatchesHtml: function(code, matches)
 	{
-		var pos = 0, 
+		var pos = 0,
 			result = '',
 			brushName = this.getParam('brush', '')
 			;
-		
+
 		function getBrushNameCss(match)
 		{
 			var result = match ? (match.brushName || brushName) : brushName;
 			return result ? result + ' ' : '';
 		};
-		
+
 		// Finally, go through the final list of matches and pull the all
 		// together adding everything in between that isn't a match.
-		for (var i = 0; i < matches.length; i++) 
+		for (var i = 0, l = matches.length; i < l; i++)
 		{
 			var match = matches[i],
 				matchBrushName
 				;
-			
-			if (match === null || match.length === 0) 
+
+			if (match === null || match.length === 0)
 				continue;
-			
+
 			matchBrushName = getBrushNameCss(match);
-			
+
 			result += wrapLinesWithCode(code.substr(pos, match.index - pos), matchBrushName + 'plain')
 					+ wrapLinesWithCode(match.value, matchBrushName + match.css)
 					;
@@ -1527,7 +2811,7 @@ sh.Highlighter.prototype = {
 
 		return result;
 	},
-	
+
 	/**
 	 * Generates HTML markup for the whole syntax highlighter.
 	 * @param {String} code Source code.
@@ -1541,7 +2825,7 @@ sh.Highlighter.prototype = {
 			matches,
 			lineNumbers
 			;
-		
+
 		// process light mode
 		if (this.getParam('light') == true)
 			this.params.toolbar = this.params.gutter = false;
@@ -1550,7 +2834,7 @@ sh.Highlighter.prototype = {
 
 		if (this.getParam('collapse') == true)
 			classes.push('collapsed');
-		
+
 		if ((gutter = this.getParam('gutter')) == false)
 			classes.push('nogutter');
 
@@ -1578,7 +2862,7 @@ sh.Highlighter.prototype = {
 
 		if (gutter)
 			lineNumbers = this.figureOutLineNumbers(code);
-		
+
 		// find matches in the code using brushes regex list
 		matches = this.findMatches(this.regexList, code);
 		// processes found matches into the html
@@ -1589,11 +2873,11 @@ sh.Highlighter.prototype = {
 		// finally, process the links
 		if (this.getParam('auto-links'))
 			html = processUrls(html);
-		
+
 		if (typeof(navigator) != 'undefined' && navigator.userAgent && navigator.userAgent.match(/MSIE/))
 			classes.push('ie');
-		
-		html = 
+
+		html =
 			'<div id="' + getHighlighterId(this.id) + '" class="' + classes.join(' ') + '">'
 				+ (this.getParam('toolbar') ? sh.toolbar.getHtml(this) : '')
 				+ '<table border="0" cellpadding="0" cellspacing="0">'
@@ -1611,10 +2895,10 @@ sh.Highlighter.prototype = {
 				+ '</table>'
 			+ '</div>'
 			;
-			
+
 		return html;
 	},
-	
+
 	/**
 	 * Highlights the code and returns complete HTML.
 	 * @param {String} code     Code to highlight.
@@ -1622,26 +2906,26 @@ sh.Highlighter.prototype = {
 	 */
 	getDiv: function(code)
 	{
-		if (code === null) 
+		if (code === null)
 			code = '';
-		
+
 		this.code = code;
 
 		var div = this.create('div');
 
 		// create main HTML
 		div.innerHTML = this.getHtml(code);
-		
+
 		// set up click handlers
 		if (this.getParam('toolbar'))
 			attachEvent(findElement(div, '.toolbar'), 'click', sh.toolbar.handler);
-		
+
 		if (this.getParam('quick-code'))
 			attachEvent(findElement(div, '.code'), 'dblclick', quickCodeHandler);
-		
+
 		return div;
 	},
-	
+
 	/**
 	 * Initializes the highlighter/brush.
 	 *
@@ -1653,18 +2937,18 @@ sh.Highlighter.prototype = {
 	init: function(params)
 	{
 		this.id = guid();
-		
+
 		// register this instance in the highlighters list
 		storeHighlighter(this);
-		
+
 		// local params take precedence over defaults
 		this.params = merge(sh.defaults, params || {})
-		
+
 		// process light mode
 		if (this.getParam('light') == true)
 			this.params.toolbar = this.params.gutter = false;
 	},
-	
+
 	/**
 	 * Converts space separated list of keywords into a regular expression string.
 	 * @param {String} str    Space separated keywords.
@@ -1676,10 +2960,10 @@ sh.Highlighter.prototype = {
 			.replace(/^\s+|\s+$/g, '')
 			.replace(/\s+/g, '|')
 			;
-		
+
 		return '\\b(?:' + str + ')\\b';
 	},
-	
+
 	/**
 	 * Makes a brush compatible with the `html-script` functionality.
 	 * @param {Object} regexGroup Object containing `left` and `right` regular expressions.
@@ -1690,11 +2974,11 @@ sh.Highlighter.prototype = {
 
 		if(regexGroup.eof)
 			regex.end = "(?:(?:" + regex.end + ")|$)";
-		
+
 		this.htmlScript = {
 			left : { regex: regexGroup.left, css: 'script' },
 			right : { regex: regexGroup.right, css: 'script' },
-			code : new XRegExp(
+			code : XRegExp(
 				"(?<left>" + regexGroup.left.source + ")" +
 				"(?<code>.*?)" +
 				"(?<right>" + regex.end + ")",
diff --git a/vendor/assets/javascripts/sh/shCore.min.js b/vendor/assets/javascripts/sh/shCore.min.js
new file mode 100644
index 00000000..b50780ea
--- /dev/null
+++ b/vendor/assets/javascripts/sh/shCore.min.js
@@ -0,0 +1,17 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+var XRegExp;if(XRegExp=XRegExp||function(e){"use strict";function t(e,t,n){var r;for(r in c.prototype)c.prototype.hasOwnProperty(r)&&(e[r]=c.prototype[r]);return e.xregexp={captureNames:t,isNative:!!n},e}function n(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}function r(e,r,i){if(!c.isRegExp(e))throw new TypeError("type RegExp expected");var a=p.replace.call(n(e)+(r||""),E,"");return i&&(a=p.replace.call(a,RegExp("["+i+"]+","g"),"")),e=e.xregexp&&!e.xregexp.isNative?t(c(e.source,a),e.xregexp.captureNames?e.xregexp.captureNames.slice(0):null):t(RegExp(e.source,a),null,!0)}function i(e,t){var n=e.length;if(Array.prototype.lastIndexOf)return e.lastIndexOf(t);for(;n--;)if(e[n]===t)return n;return-1}function a(e,t){return Object.prototype.toString.call(e).toLowerCase()==="[object "+t+"]"}function l(e){return e=e||{},"all"===e||e.all?e={natives:!0,extensibility:!0}:a(e,"string")&&(e=c.forEach(e,/[^\s,]+/,function(e){this[e]=!0},{})),e}function s(e,t,n,r){var i,a,l=m.length,s=null;R=!0;try{for(;l--;)if(a=m[l],!("all"!==a.scope&&a.scope!==n||a.trigger&&!a.trigger.call(r))&&(a.pattern.lastIndex=t,i=d.exec.call(a.pattern,e),i&&i.index===t)){s={output:a.handler.call(r,i,n),match:i};break}}catch(o){throw o}finally{R=!1}return s}function o(e){c.addToken=g[e?"on":"off"],f.extensibility=e}function u(e){RegExp.prototype.exec=(e?d:p).exec,RegExp.prototype.test=(e?d:p).test,String.prototype.match=(e?d:p).match,String.prototype.replace=(e?d:p).replace,String.prototype.split=(e?d:p).split,f.natives=e}var c,g,h,f={natives:!1,extensibility:!1},p={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},d={},x={},m=[],v="default",b="class",y={"default":/^(?:\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??)/,"class":/^(?:\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S]))/},w=/\$(?:{([\w$]+)}|(\d\d?|[\s\S]))/g,E=/([\s\S])(?=[\s\S]*\1)/g,S=/^(?:[?*+]|{\d+(?:,\d*)?})\??/,N=p.exec.call(/()??/,"")[1]===e,H=RegExp.prototype.sticky!==e,R=!1,P="gim"+(H?"y":"");return c=function(n,i){if(c.isRegExp(n)){if(i!==e)throw new TypeError("can't supply flags when constructing one RegExp from another");return r(n)}if(R)throw Error("can't call the XRegExp constructor within token definition functions");var a,l,o,u=[],g=v,h={hasNamedCapture:!1,captureNames:[],hasFlag:function(e){return i.indexOf(e)>-1}},f=0;if(n=n===e?"":n+"",i=i===e?"":i+"",p.match.call(i,E))throw new SyntaxError("invalid duplicate regular expression flag");for(n=p.replace.call(n,/^\(\?([\w$]+)\)/,function(e,t){if(p.test.call(/[gy]/,t))throw new SyntaxError("can't use flag g or y in mode modifier");return i=p.replace.call(i+t,E,""),""}),c.forEach(i,/[\s\S]/,function(e){if(0>P.indexOf(e[0]))throw new SyntaxError("invalid regular expression flag "+e[0])});n.length>f;)a=s(n,f,g,h),a?(u.push(a.output),f+=a.match[0].length||1):(l=p.exec.call(y[g],n.slice(f)),l?(u.push(l[0]),f+=l[0].length):(o=n.charAt(f),"["===o?g=b:"]"===o&&(g=v),u.push(o),++f));return t(RegExp(u.join(""),p.replace.call(i,/[^gimy]+/g,"")),h.hasNamedCapture?h.captureNames:null)},g={on:function(e,t,n){n=n||{},e&&m.push({pattern:r(e,"g"+(H?"y":"")),handler:t,scope:n.scope||v,trigger:n.trigger||null}),n.customFlags&&(P=p.replace.call(P+n.customFlags,E,""))},off:function(){throw Error("extensibility must be installed before using addToken")}},c.addToken=g.off,c.cache=function(e,t){var n=e+"/"+(t||"");return x[n]||(x[n]=c(e,t))},c.escape=function(e){return p.replace.call(e,/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},c.exec=function(e,t,n,i){var a,l=r(t,"g"+(i&&H?"y":""),i===!1?"y":"");return l.lastIndex=n=n||0,a=d.exec.call(l,e),i&&a&&a.index!==n&&(a=null),t.global&&(t.lastIndex=a?l.lastIndex:0),a},c.forEach=function(e,t,n,r){for(var i,a=0,l=-1;i=c.exec(e,t,a);)n.call(r,i,++l,e,t),a=i.index+(i[0].length||1);return r},c.globalize=function(e){return r(e,"g")},c.install=function(e){e=l(e),!f.natives&&e.natives&&u(!0),!f.extensibility&&e.extensibility&&o(!0)},c.isInstalled=function(e){return!!f[e]},c.isRegExp=function(e){return a(e,"regexp")},c.matchChain=function(e,t){return function n(e,r){var i,a=t[r].regex?t[r]:{regex:t[r]},l=[],s=function(e){l.push(a.backref?e[a.backref]||"":e[0])};for(i=0;e.length>i;++i)c.forEach(e[i],a.regex,s);return r!==t.length-1&&l.length?n(l,r+1):l}([e],0)},c.replace=function(t,n,i,a){var l,s=c.isRegExp(n),o=n;return s?(a===e&&n.global&&(a="all"),o=r(n,"all"===a?"g":"","all"===a?"":"g")):"all"===a&&(o=RegExp(c.escape(n+""),"g")),l=d.replace.call(t+"",o,i),s&&n.global&&(n.lastIndex=0),l},c.split=function(e,t,n){return d.split.call(e,t,n)},c.test=function(e,t,n,r){return!!c.exec(e,t,n,r)},c.uninstall=function(e){e=l(e),f.natives&&e.natives&&u(!1),f.extensibility&&e.extensibility&&o(!1)},c.union=function(e,t){var n,r,i,l,s=/(\()(?!\?)|\\([1-9]\d*)|\\[\s\S]|\[(?:[^\\\]]|\\[\s\S])*]/g,o=0,u=function(e,t,i){var a=r[o-n];if(t){if(++o,a)return"(?<"+a+">"}else if(i)return"\\"+(+i+n);return e},g=[];if(!a(e,"array")||!e.length)throw new TypeError("patterns must be a nonempty array");for(l=0;e.length>l;++l)i=e[l],c.isRegExp(i)?(n=o,r=i.xregexp&&i.xregexp.captureNames||[],g.push(c(i.source).source.replace(s,u))):g.push(c.escape(i));return c(g.join("|"),t)},c.version="2.0.0",d.exec=function(t){var r,a,l,s,o;if(this.global||(s=this.lastIndex),r=p.exec.apply(this,arguments)){if(!N&&r.length>1&&i(r,"")>-1&&(l=RegExp(this.source,p.replace.call(n(this),"g","")),p.replace.call((t+"").slice(r.index),l,function(){var t;for(t=1;arguments.length-2>t;++t)arguments[t]===e&&(r[t]=e)})),this.xregexp&&this.xregexp.captureNames)for(o=1;r.length>o;++o)a=this.xregexp.captureNames[o-1],a&&(r[a]=r[o]);this.global&&!r[0].length&&this.lastIndex>r.index&&(this.lastIndex=r.index)}return this.global||(this.lastIndex=s),r},d.test=function(e){return!!d.exec.call(this,e)},d.match=function(e){if(c.isRegExp(e)){if(e.global){var t=p.match.apply(this,arguments);return e.lastIndex=0,t}}else e=RegExp(e);return d.exec.call(e,this)},d.replace=function(e,t){var n,r,l,s,o=c.isRegExp(e);return o?(e.xregexp&&(n=e.xregexp.captureNames),e.global||(s=e.lastIndex)):e+="",a(t,"function")?r=p.replace.call(this+"",e,function(){var r,i=arguments;if(n)for(i[0]=new String(i[0]),r=0;n.length>r;++r)n[r]&&(i[0][n[r]]=i[r+1]);return o&&e.global&&(e.lastIndex=i[i.length-2]+i[0].length),t.apply(null,i)}):(l=this+"",r=p.replace.call(l,e,function(){var e=arguments;return p.replace.call(t+"",w,function(t,r,a){var l;if(r){if(l=+r,e.length-3>=l)return e[l]||"";if(l=n?i(n,r):-1,0>l)throw new SyntaxError("backreference to undefined group "+t);return e[l+1]||""}if("$"===a)return"$";if("&"===a||0===+a)return e[0];if("`"===a)return e[e.length-1].slice(0,e[e.length-2]);if("'"===a)return e[e.length-1].slice(e[e.length-2]+e[0].length);if(a=+a,!isNaN(a)){if(a>e.length-3)throw new SyntaxError("backreference to undefined group "+t);return e[a]||""}throw new SyntaxError("invalid token "+t)})})),o&&(e.lastIndex=e.global?0:s),r},d.split=function(t,n){if(!c.isRegExp(t))return p.split.apply(this,arguments);var r,i=this+"",a=t.lastIndex,l=[],s=0;return n=(n===e?-1:n)>>>0,c.forEach(i,t,function(e){e.index+e[0].length>s&&(l.push(i.slice(s,e.index)),e.length>1&&e.index<i.length&&Array.prototype.push.apply(l,e.slice(1)),r=e[0].length,s=e.index+r)}),s===i.length?(!p.test.call(t,"")||r)&&l.push(""):l.push(i.slice(s)),t.lastIndex=a,l.length>n?l.slice(0,n):l},h=g.on,h(/\\([ABCE-RTUVXYZaeg-mopqyz]|c(?![A-Za-z])|u(?![\dA-Fa-f]{4})|x(?![\dA-Fa-f]{2}))/,function(e,t){if("B"===e[1]&&t===v)return e[0];throw new SyntaxError("invalid escape "+e[0])},{scope:"all"}),h(/\[(\^?)]/,function(e){return e[1]?"[\\s\\S]":"\\b\\B"}),h(/(?:\(\?#[^)]*\))+/,function(e){return p.test.call(S,e.input.slice(e.index+e[0].length))?"":"(?:)"}),h(/\\k<([\w$]+)>/,function(e){var t=isNaN(e[1])?i(this.captureNames,e[1])+1:+e[1],n=e.index+e[0].length;if(!t||t>this.captureNames.length)throw new SyntaxError("backreference to undefined group "+e[0]);return"\\"+t+(n===e.input.length||isNaN(e.input.charAt(n))?"":"(?:)")}),h(/(?:\s+|#.*)+/,function(e){return p.test.call(S,e.input.slice(e.index+e[0].length))?"":"(?:)"},{trigger:function(){return this.hasFlag("x")},customFlags:"x"}),h(/\./,function(){return"[\\s\\S]"},{trigger:function(){return this.hasFlag("s")},customFlags:"s"}),h(/\(\?P?<([\w$]+)>/,function(e){if(!isNaN(e[1]))throw new SyntaxError("can't use integer as capture name "+e[0]);return this.captureNames.push(e[1]),this.hasNamedCapture=!0,"("}),h(/\\(\d+)/,function(e,t){if(!(t===v&&/^[1-9]/.test(e[1])&&+e[1]<=this.captureNames.length)&&"0"!==e[1])throw new SyntaxError("can't use octal escape or backreference to undefined group "+e[0]);return e[0]},{scope:"all"}),h(/\((?!\?)/,function(){return this.hasFlag("n")?"(?:":(this.captureNames.push(null),"(")},{customFlags:"n"}),"undefined"!=typeof exports&&(exports.XRegExp=c),c}(),SyntaxHighlighter===void 0)var SyntaxHighlighter=function(){function e(e,t){return-1!=e.className.indexOf(t)}function t(t,n){e(t,n)||(t.className+=" "+n)}function n(e,t){e.className=e.className.replace(t,"")}function r(e){for(var t=[],n=0,r=e.length;r>n;n++)t.push(e[n]);return t}function i(e){return e.split(/\r?\n/)}function a(e){var t="highlighter_";return 0==e.indexOf(t)?e:t+e}function l(e){return M.vars.highlighters[a(e)]}function s(e){return document.getElementById(a(e))}function o(e){M.vars.highlighters[a(e.id)]=e}function u(e,t,n){if(null==e)return null;var r,i,a=1!=n?e.childNodes:[e.parentNode],l={"#":"id",".":"className"}[t.substr(0,1)]||"nodeName";if(r="nodeName"!=l?t.substr(1):t.toUpperCase(),-1!=(e[l]||"").indexOf(r))return e;for(var s=0,o=a.length;a&&o>s&&null==i;s++)i=u(a[s],t,n);return i}function c(e,t){return u(e,t,!0)}function g(e,t,n){n=Math.max(n||0,0);for(var r=n,i=e.length;i>r;r++)if(e[r]==t)return r;return-1}function h(e){return(e||"")+(""+Math.round(1e6*Math.random()))}function f(e,t){var n,r={};for(n in e)r[n]=e[n];for(n in t)r[n]=t[n];return r}function p(e){var t={"true":!0,"false":!1}[e];return null==t?e:t}function d(e,t,n,r,i){var a=(screen.width-n)/2,l=(screen.height-r)/2;i+=", left="+a+", top="+l+", width="+n+", height="+r,i=i.replace(/^,/,"");var s=window.open(e,t,i);return s.focus(),s}function x(e,t,n,r){function i(e){e=e||window.event,e.target||(e.target=e.srcElement,e.preventDefault=function(){this.returnValue=!1}),n.call(r||window,e)}e.attachEvent?e.attachEvent("on"+t,i):e.addEventListener(t,i,!1)}function m(e){window.alert(M.config.strings.alert+e)}function v(e,t){var n=M.vars.discoveredBrushes,r=null;if(null==n){n={};for(var i in M.brushes){var a=M.brushes[i],l=a.aliases;if(null!=l){a.brushName=i.toLowerCase();for(var s=0,o=l.length;o>s;s++)n[l[s]]=i}}M.vars.discoveredBrushes=n}return r=M.brushes[n[e]],null==r&&t&&m(M.config.strings.noBrush+e),r}function b(e,t){for(var n=i(e),r=0,a=n.length;a>r;r++)n[r]=t(n[r],r);return n.join("\r\n")}function y(e){return e.replace(/^[ ]*[\n]+|[\n]*[ ]*$/g,"")}function w(e){for(var t,n={},r=XRegExp("^\\[(?<values>(.*?))\\]$"),i=0,a=XRegExp("(?<name>[\\w-]+)\\s*:\\s*(?<value>[\\w%#-]+|\\[.*?\\]|\".*?\"|'.*?')\\s*;?","g");null!=(t=XRegExp.exec(e,a,i));){var l=t.value.replace(/^['"]|['"]$/g,"");if(null!=l&&r.test(l)){var s=XRegExp.exec(l,r);l=s.values.length>0?s.values.split(/\s*,\s*/):[]}n[t.name]=l,i=t.index+t[0].length}return n}function E(e,t){return null==e||0==e.length||"\n"==e?e:(e=e.replace(/</g,"&lt;"),e=e.replace(/ {2,}/g,function(e){for(var t="",n=0,r=e.length;r-1>n;n++)t+=M.config.space;return t+" "}),null!=t&&(e=b(e,function(e){if(0==e.length)return"";var n="";return e=e.replace(/^(&nbsp;| )+/,function(e){return n=e,""}),0==e.length?n:n+'<code class="'+t+'">'+e+"</code>"})),e)}function S(e,t){for(var n=""+e;t>n.length;)n="0"+n;return n}function N(e,t){for(var n="",r=0;t>r;r++)n+=" ";return e.replace(/\t/g,n)}function H(e,t){function n(e,t,n){return e.substr(0,t)+a.substr(0,n)+e.substr(t+1,e.length)}for(var r=(i(e),"	"),a="",l=0;50>l;l++)a+="                    ";return e=b(e,function(e){if(-1==e.indexOf(r))return e;for(var i=0;-1!=(i=e.indexOf(r));){var a=t-i%t;e=n(e,i,a)}return e})}function R(e){var t=/<br\s*\/?>|&lt;br\s*\/?&gt;/gi;return 1==M.config.bloggerMode&&(e=e.replace(t,"\n")),1==M.config.stripBrs&&(e=e.replace(t,"")),e}function P(e){return e.replace(/^\s+|\s+$/g,"")}function T(e){for(var t=i(R(e)),n=/^\s*/,r=1e3,a=0,l=t.length;l>a&&r>0;a++){var s=t[a];if(0!=P(s).length){var o=n.exec(s);if(null==o)return e;r=Math.min(o[0].length,r)}}if(r>0)for(var a=0,l=t.length;l>a;a++)t[a]=t[a].substr(r);return t.join("\n")}function k(e,t){return e.index<t.index?-1:e.index>t.index?1:e.length<t.length?-1:e.length>t.length?1:0}function C(e,t){function n(e){return e[0]}var r=null,i=[],a=t.func?t.func:n;for(pos=0;null!=(r=XRegExp.exec(e,t.regex,pos));){var l=a(r,t);"string"==typeof l&&(l=[new M.Match(l,r.index,t.css)]),i=i.concat(l),pos=r.index+r[0].length}return i}function L(e){var t=/(.*)((&gt;|&lt;).*)/;return e.replace(M.regexLib.url,function(e){var n="",r=null;return(r=t.exec(e))&&(e=r[1],n=r[2]),'<a href="'+e+'">'+e+"</a>"+n})}function I(){for(var e=document.getElementsByTagName("script"),t=[],n=0,r=e.length;r>n;n++)"syntaxhighlighter"==e[n].type&&t.push(e[n]);return t}function A(e){var t="<![CDATA[",n="]]>",r=P(e),i=!1,a=t.length,l=n.length;0==r.indexOf(t)&&(r=r.substring(a),i=!0);var s=r.length;return r.indexOf(n)==s-l&&(r=r.substring(0,s-l),i=!0),i?r:e}function X(e){var r,i=e.target,a=c(i,".syntaxhighlighter"),s=c(i,".container"),o=document.createElement("textarea");if(s&&a&&!u(s,"textarea")){r=l(a.id),t(a,"source");for(var g=s.childNodes,h=[],f=0,p=g.length;p>f;f++)h.push(g[f].innerText||g[f].textContent);h=h.join("\r"),h=h.replace(/\u00a0/g," "),o.appendChild(document.createTextNode(h)),s.appendChild(o),o.focus(),o.select(),x(o,"blur",function(){o.parentNode.removeChild(o),n(a,"source")})}}"undefined"!=typeof require&&XRegExp===void 0&&(XRegExp=require("xregexp").XRegExp);var M={defaults:{"class-name":"","first-line":1,"pad-line-numbers":!1,highlight:null,title:null,"smart-tabs":!0,"tab-size":4,gutter:!0,toolbar:!0,"quick-code":!0,collapse:!1,"auto-links":!0,light:!1,unindent:!0,"html-script":!1},config:{space:"&nbsp;",useScriptTags:!0,bloggerMode:!1,stripBrs:!1,tagName:"pre",strings:{expandSource:"expand source",help:"?",alert:"SyntaxHighlighter\n\n",noBrush:"Can't find brush for: ",brushNotHtmlScript:"Brush wasn't configured for html-script option: ",aboutDialog:'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>About SyntaxHighlighter</title></head><body style="font-family:Geneva,Arial,Helvetica,sans-serif;background-color:#fff;color:#000;font-size:1em;text-align:center;"><div style="text-align:center;margin-top:1.5em;"><div style="font-size:xx-large;">SyntaxHighlighter</div><div style="font-size:.75em;margin-bottom:3em;"><div>version 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)</div><div><a href="http://alexgorbatchev.com/SyntaxHighlighter" target="_blank" style="color:#005896">http://alexgorbatchev.com/SyntaxHighlighter</a></div><div>JavaScript code syntax highlighter.</div><div>Copyright 2004-2013 Alex Gorbatchev.</div></div><div>If you like this script, please <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2930402" style="color:#005896">donate</a> to <br/>keep development active!</div></div></body></html>'}},vars:{discoveredBrushes:null,highlighters:{}},brushes:{},regexLib:{multiLineCComments:XRegExp("/\\*.*?\\*/","gs"),singleLineCComments:/\/\/.*$/gm,singleLinePerlComments:/#.*$/gm,doubleQuotedString:/"([^\\"\n]|\\.)*"/g,singleQuotedString:/'([^\\'\n]|\\.)*'/g,multiLineDoubleQuotedString:XRegExp('"([^\\\\"]|\\\\.)*"',"gs"),multiLineSingleQuotedString:XRegExp("'([^\\\\']|\\\\.)*'","gs"),xmlComments:XRegExp("(&lt;|<)!--.*?--(&gt;|>)","gs"),url:/\w+:\/\/[\w-.\/?%&=:@;#]*/g,phpScriptTags:{left:/(&lt;|<)\?(?:=|php)?/g,right:/\?(&gt;|>)/g,eof:!0},aspScriptTags:{left:/(&lt;|<)%=?/g,right:/%(&gt;|>)/g},scriptScriptTags:{left:/(&lt;|<)\s*script.*?(&gt;|>)/gi,right:/(&lt;|<)\/\s*script\s*(&gt;|>)/gi}},toolbar:{getHtml:function(e){function t(e,t){return M.toolbar.getButtonHtml(e,t,M.config.strings[t])}for(var n='<div class="toolbar">',r=M.toolbar.items,i=r.list,a=0,l=i.length;l>a;a++)n+=(r[i[a]].getHtml||t)(e,i[a]);return n+="</div>"},getButtonHtml:function(e,t,n){return'<span><a href="#" class="toolbar_item command_'+t+" "+t+'">'+n+"</a></span>"},handler:function(e){function t(e){var t=RegExp(e+"_(\\w+)"),n=t.exec(r);return n?n[1]:null}var n=e.target,r=n.className||"",i=l(c(n,".syntaxhighlighter").id),a=t("command");i&&a&&M.toolbar.items[a].execute(i),e.preventDefault()},items:{list:["expandSource","help"],expandSource:{getHtml:function(e){if(1!=e.getParam("collapse"))return"";var t=e.getParam("title");return M.toolbar.getButtonHtml(e,"expandSource",t?t:M.config.strings.expandSource)},execute:function(e){var t=s(e.id);n(t,"collapsed")}},help:{execute:function(){var e=d("","_blank",500,250,"scrollbars=0"),t=e.document;t.write(M.config.strings.aboutDialog),t.close(),e.focus()}}}},findElements:function(e,t){var n=t?[t]:r(document.getElementsByTagName(M.config.tagName)),i=M.config,a=[];if(i.useScriptTags&&(n=n.concat(I())),0===n.length)return a;for(var l=0,s=n.length;s>l;l++){var o={target:n[l],params:f(e,w(n[l].className))};null!=o.params.brush&&a.push(o)}return a},highlight:function(e,t){var n=this.findElements(e,t),r="innerHTML",i=null,a=M.config;if(0!==n.length)for(var l=0,s=n.length;s>l;l++){var o,t=n[l],u=t.target,c=t.params,g=c.brush;if(null!=g){if("true"==c["html-script"]||1==M.defaults["html-script"])i=new M.HtmlScript(g),g="htmlscript";else{var h=v(g);if(!h)continue;i=new h}o=u[r],a.useScriptTags&&(o=A(o)),""!=(u.title||"")&&(c.title=u.title),c.brush=g,i.init(c),t=i.getDiv(o),""!=(u.id||"")&&(t.id=u.id),u.parentNode.replaceChild(t,u)}}},all:function(e){x(window,"load",function(){M.highlight(e)})}};return M.Match=function(e,t,n){this.value=e,this.index=t,this.length=e.length,this.css=n,this.brushName=null},M.Match.prototype.toString=function(){return this.value},M.HtmlScript=function(e){function t(e,t){for(var n=0,r=e.length;r>n;n++)e[n].index+=t}function n(e){for(var n,a=e.code,l=[],s=r.regexList,o=e.index+e.left.length,u=r.htmlScript,c=0,g=s.length;g>c;c++)n=C(a,s[c]),t(n,o),l=l.concat(n);null!=u.left&&null!=e.left&&(n=C(e.left,u.left),t(n,e.index),l=l.concat(n)),null!=u.right&&null!=e.right&&(n=C(e.right,u.right),t(n,e.index+e[0].lastIndexOf(e.right)),l=l.concat(n));for(var h=0,g=l.length;g>h;h++)l[h].brushName=i.brushName;return l}var r,i=v(e),a=new M.brushes.Xml,l=this,s="getDiv getHtml init".split(" ");if(null!=i){r=new i;for(var o=0,u=s.length;u>o;o++)(function(){var e=s[o];l[e]=function(){return a[e].apply(a,arguments)}})();return null==r.htmlScript?(m(M.config.strings.brushNotHtmlScript+e),void 0):(a.regexList.push({regex:r.htmlScript.code,func:n}),void 0)}},M.Highlighter=function(){},M.Highlighter.prototype={getParam:function(e,t){var n=this.params[e];return p(null==n?t:n)},create:function(e){return document.createElement(e)},findMatches:function(e,t){var n=[];if(null!=e)for(var r=0,i=e.length;i>r;r++)"object"==typeof e[r]&&(n=n.concat(C(t,e[r])));return this.removeNestedMatches(n.sort(k))},removeNestedMatches:function(e){for(var t=0,n=e.length;n>t;t++)if(null!==e[t])for(var r=e[t],i=r.index+r.length,a=t+1,n=e.length;n>a&&null!==e[t];a++){var l=e[a];if(null!==l){if(l.index>i)break;l.index==r.index&&l.length>r.length?e[t]=null:l.index>=r.index&&i>l.index&&(e[a]=null)}}return e},figureOutLineNumbers:function(e){var t=[],n=parseInt(this.getParam("first-line"));return b(e,function(e,r){t.push(r+n)}),t},isLineHighlighted:function(e){var t=this.getParam("highlight",[]);return"object"!=typeof t&&null==t.push&&(t=[t]),-1!=g(t,""+e)},getLineHtml:function(e,t,n){var r=["line","number"+t,"index"+e,"alt"+(""+(0==t%2?1:2))];return this.isLineHighlighted(t)&&r.push("highlighted"),0==t&&r.push("break"),'<div class="'+r.join(" ")+'">'+n+"</div>"},getLineNumbersHtml:function(e,t){var n="",r=i(e).length,a=parseInt(this.getParam("first-line")),l=this.getParam("pad-line-numbers");1==l?l=(""+(a+r-1)).length:1==isNaN(l)&&(l=0);for(var s=0;r>s;s++){var o=t?t[s]:a+s,e=0==o?M.config.space:S(o,l);n+=this.getLineHtml(s,o,e)}return n},getCodeLinesHtml:function(e,t){e=P(e);for(var n=i(e),r=(this.getParam("pad-line-numbers"),parseInt(this.getParam("first-line"))),e="",a=this.getParam("brush"),l=0,s=n.length;s>l;l++){var o=n[l],u=/^(&nbsp;|\s)+/.exec(o),c=null,g=t?t[l]:r+l;null!=u&&(c=""+u[0],o=o.substr(c.length),c=c.replace(" ",M.config.space)),o=P(o),0==o.length&&(o=M.config.space),e+=this.getLineHtml(l,g,(null!=c?'<code class="'+a+' spaces">'+c+"</code>":"")+o)}return e},getTitleHtml:function(e){return e?"<caption>"+e+"</caption>":""},getMatchesHtml:function(e,t){function n(e){var t=e?e.brushName||a:a;return t?t+" ":""}for(var r=0,i="",a=this.getParam("brush",""),l=0,s=t.length;s>l;l++){var o,u=t[l];null!==u&&0!==u.length&&(o=n(u),i+=E(e.substr(r,u.index-r),o+"plain")+E(u.value,o+u.css),r=u.index+u.length+(u.offset||0))}return i+=E(e.substr(r),n()+"plain")},getHtml:function(e){var t,n,r,i="",l=["syntaxhighlighter"];return 1==this.getParam("light")&&(this.params.toolbar=this.params.gutter=!1),className="syntaxhighlighter",1==this.getParam("collapse")&&l.push("collapsed"),0==(gutter=this.getParam("gutter"))&&l.push("nogutter"),l.push(this.getParam("class-name")),l.push(this.getParam("brush")),e=y(e).replace(/\r/g," "),t=this.getParam("tab-size"),e=1==this.getParam("smart-tabs")?H(e,t):N(e,t),this.getParam("unindent")&&(e=T(e)),gutter&&(r=this.figureOutLineNumbers(e)),n=this.findMatches(this.regexList,e),i=this.getMatchesHtml(e,n),i=this.getCodeLinesHtml(i,r),this.getParam("auto-links")&&(i=L(i)),"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.match(/MSIE/)&&l.push("ie"),i='<div id="'+a(this.id)+'" class="'+l.join(" ")+'">'+(this.getParam("toolbar")?M.toolbar.getHtml(this):"")+'<table border="0" cellpadding="0" cellspacing="0">'+this.getTitleHtml(this.getParam("title"))+"<tbody>"+"<tr>"+(gutter?'<td class="gutter">'+this.getLineNumbersHtml(e)+"</td>":"")+'<td class="code">'+'<div class="container">'+i+"</div>"+"</td>"+"</tr>"+"</tbody>"+"</table>"+"</div>"},getDiv:function(e){null===e&&(e=""),this.code=e;var t=this.create("div");return t.innerHTML=this.getHtml(e),this.getParam("toolbar")&&x(u(t,".toolbar"),"click",M.toolbar.handler),this.getParam("quick-code")&&x(u(t,".code"),"dblclick",X),t},init:function(e){this.id=h(),o(this),this.params=f(M.defaults,e||{}),1==this.getParam("light")&&(this.params.toolbar=this.params.gutter=!1)},getKeywords:function(e){return e=e.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"|"),"\\b(?:"+e+")\\b"},forHtmlScript:function(e){var t={end:e.right.source};e.eof&&(t.end="(?:(?:"+t.end+")|$)"),this.htmlScript={left:{regex:e.left,css:"script"},right:{regex:e.right,css:"script"},code:XRegExp("(?<left>"+e.left.source+")"+"(?<code>.*?)"+"(?<right>"+t.end+")","sgi")}}},M}();"undefined"!=typeof exports?exports.SyntaxHighlighter=SyntaxHighlighter:null;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/sh/shLegacy.js b/vendor/assets/javascripts/sh/shLegacy.js
old mode 100644
new mode 100755
index 6d9fd4d1..dd8f4b9c
--- a/vendor/assets/javascripts/sh/shLegacy.js
+++ b/vendor/assets/javascripts/sh/shLegacy.js
@@ -6,12 +6,152 @@
  * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
  *
  * @version
- * 3.0.83 (July 02 2010)
- * 
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
  * @copyright
- * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
  *
  * @license
  * Dual licensed under the MIT and GPL licenses.
  */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('3 u={8:{}};u.8={A:4(c,k,l,m,n,o){4 d(a,b){2 a!=1?a:b}4 f(a){2 a!=1?a.E():1}c=c.I(":");3 g=c[0],e={};t={"r":K};M=1;5=8.5;9(3 j R c)e[c[j]]="r";k=f(d(k,5.C));l=f(d(l,5.D));m=f(d(m,5.s));o=f(d(o,5.Q));n=f(d(n,5["x-y"]));2{P:g,C:d(t[e.O],k),D:d(t[e.N],l),s:d({"r":r}[e.s],m),"x-y":d(4(a,b){9(3 h=T S("^"+b+"\\\\[(?<q>\\\\w+)\\\\]$","U"),i=1,p=0;p<a.7;p++)6((i=h.J(a[p]))!=1)2 i.q;2 1}(c,"G"),n)}},F:4(c,k,l,m,n,o){4 d(){9(3 a=H,b=0;b<a.7;b++)6(a[b]!==1){6(z a[b]=="L"&&a[b]!="")2 a[b]+"";6(z a[b]=="X"&&a[b].q!="")2 a[b].q+""}2 1}4 f(a,b,h){h=12.13(h);9(3 i=0;i<h.7;i++)h[i].V("15")==b&&a.Y(h[i])}3 g=[];f(g,c,"Z");f(g,c,"W");6(g.7!==0)9(c=0;c<g.7;c++){3 e=g[c],j=d(e.B["14"],e.10,e.B.v,e.v);6(j!==1){j=u.8.A(j,k,l,m,n,o);8.11(j,e)}}}};',62,68,'|null|return|var|function|defaults|if|length|SyntaxHighlighter|for|||||||||||||||||value|true|collapse|reverse|dp|language||first|line|typeof|parseParams|attributes|gutter|toolbar|toString|HighlightAll|firstline|arguments|split|exec|false|string|result|nocontrols|nogutter|brush|ruler|in|XRegExp|new|gi|getAttribute|textarea|object|push|pre|className|highlight|document|getElementsByTagName|class|name'.split('|'),0,{}))
+var dp = {
+	SyntaxHighlighter : {}
+};
+
+dp.SyntaxHighlighter = {
+	parseParams: function(
+						input,
+						showGutter, 
+						showControls, 
+						collapseAll, 
+						firstLine, 
+						showColumns
+						)
+	{
+		function getValue(list, name)
+		{
+			var regex = XRegExp('^' + name + '\\[(?<value>\\w+)\\]$', 'gi'),
+				match = null
+				;
+			
+			for (var i = 0; i < list.length; i++) 
+				if ((match = XRegExp.exec(list[i], regex)) != null)
+					return match.value;
+			
+			return null;
+		};
+		
+		function defaultValue(value, def)
+		{
+			return value != null ? value : def;
+		};
+		
+		function asString(value)
+		{
+			return value != null ? value.toString() : null;
+		};
+
+		var parts = input.split(':'),
+			brushName = parts[0],
+			options = {},
+			straight = { 'true' : true }
+			reverse = { 'true' : false },
+			result = null,
+			defaults = SyntaxHighlighter.defaults
+			;
+		
+		for (var i in parts)
+			options[parts[i]] = 'true';
+
+		showGutter = asString(defaultValue(showGutter, defaults.gutter));
+		showControls = asString(defaultValue(showControls, defaults.toolbar));
+		collapseAll = asString(defaultValue(collapseAll, defaults.collapse)); 
+		showColumns = asString(defaultValue(showColumns, defaults.ruler));
+		firstLine = asString(defaultValue(firstLine, defaults['first-line'])); 
+
+		return {
+			brush			: brushName,
+			gutter			: defaultValue(reverse[options.nogutter], showGutter),
+			toolbar			: defaultValue(reverse[options.nocontrols], showControls),
+			collapse		: defaultValue(straight[options.collapse], collapseAll),
+			// ruler			: defaultValue(straight[options.showcolumns], showColumns),
+			'first-line'	: defaultValue(getValue(parts, 'firstline'), firstLine)
+		};
+	},
+	
+	HighlightAll: function(
+						name, 
+						showGutter /* optional */, 
+						showControls /* optional */, 
+						collapseAll /* optional */, 
+						firstLine /* optional */, 
+						showColumns /* optional */
+						)
+	{
+		function findValue()
+		{
+			var a = arguments;
+			
+			for (var i = 0; i < a.length; i++) 
+			{
+				if (a[i] === null) 
+					continue;
+				
+				if (typeof(a[i]) == 'string' && a[i] != '') 
+					return a[i] + '';
+				
+				if (typeof(a[i]) == 'object' && a[i].value != '') 
+					return a[i].value + '';
+			}
+			
+			return null;
+		};
+
+		function findTagsByName(list, name, tagName)
+		{
+			var tags = document.getElementsByTagName(tagName);
+			
+			for (var i = 0; i < tags.length; i++) 
+				if (tags[i].getAttribute('name') == name) 
+					list.push(tags[i]);
+		}
+		
+		var elements = [],
+			highlighter = null,
+			registered = {},
+			propertyName = 'innerHTML'
+			;
+		
+		// for some reason IE doesn't find <pre/> by name, however it does see them just fine by tag name... 
+		findTagsByName(elements, name, 'pre');
+		findTagsByName(elements, name, 'textarea');
+
+		if (elements.length === 0)
+			return;
+		
+		for (var i = 0; i < elements.length; i++)
+		{
+			var element = elements[i],
+				params = findValue(
+					element.attributes['class'], element.className, 
+					element.attributes['language'], element.language
+					),
+				language = ''
+				;
+			
+			if (params === null) 
+				continue;
+
+			params = dp.SyntaxHighlighter.parseParams(
+				params,
+				showGutter, 
+				showControls, 
+				collapseAll, 
+				firstLine, 
+				showColumns
+				);
+
+			SyntaxHighlighter.highlight(params, element);
+		}
+	}
+};
diff --git a/vendor/assets/stylesheets/sh/_theme_template.scss b/vendor/assets/stylesheets/sh/_theme_template.scss
deleted file mode 100644
index 53f4df53..00000000
--- a/vendor/assets/stylesheets/sh/_theme_template.scss
+++ /dev/null
@@ -1,120 +0,0 @@
-$background:					white !default;
-
-$line_alt1_background:			$background !default;
-$line_alt2_background:			$background !default;
-
-$line_highlighted_background:	#e0e0e0 !default;
-$line_highlighted_number:		black !default;
-
-$gutter_text:					#afafaf !default;
-$gutter_border_color:			#6ce26c !default;
-$gutter_border:					3px solid $gutter_border_color !default;
-
-$toolbar_collapsed_a:			#00f !default;
-$toolbar_collapsed_a_hover:		#f00 !default;
-$toolbar_collapsed_background:	#fff !default;
-$toolbar_collapsed_border:		1px solid $gutter_border_color !default;
-
-$toolbar_a:						#fff !default;
-$toolbar_a_hover:				#000 !default;
-$toolbar_background:			$gutter_border_color !default;
-$toolbar_border:				none !default;
-
-$code_plain:					black !default;
-$code_comments:					#008200 !default;
-$code_string:					blue !default;
-$code_keyword:					#006699 !default;
-$code_preprocessor:				gray !default;
-$code_variable:					#aa7700 !default;
-$code_value:					#009900 !default;
-$code_functions:				#ff1493 !default;
-$code_constants:				#0066cc !default;
-$code_script:					$code_keyword !default;
-$code_script_background:		none !default;
-$code_color1:					gray !default;
-$code_color2:					#ff1493 !default;
-$code_color3:					red !default;
-
-$caption_color:					$code_plain !default;
-
-// Interface elements.
-.syntaxhighlighter {
-	background-color: $background !important;
-
-	// Highlighed line number
-	.line {
-		&.alt1 { background-color: $line_alt1_background !important; }
-		&.alt2 { background-color: $line_alt2_background !important; }
-		
-		// Highlighed line
-		&.highlighted {
-			&.alt1, &.alt2 { background-color: $line_highlighted_background !important; }
-			&.number { color: $line_highlighted_number !important; }
-		}
-	}
-	
-	table {
-		caption {
-			color: $caption_color !important;
-		}
-	}
-	
-	// Add border to the lines
-	.gutter {
-		color: $gutter_text !important;
-		.line {
-			border-right: $gutter_border !important;
-			
-			&.highlighted {
-				background-color: $gutter_border_color !important;
-				color: $background !important;
-			} 
-		} 
-	}
-	
-	&.printing .line .content { border: none !important; }
-	
-	&.collapsed {
-		overflow: visible !important;
-		
-		.toolbar {
-			color: $toolbar_collapsed_a !important;
-			background: $toolbar_collapsed_background !important;
-			border: $toolbar_collapsed_border !important;
-			
-			a {
-				color: $toolbar_collapsed_a !important;
-				&:hover { color: $toolbar_collapsed_a_hover !important; } 
-			} 
-		}
-	}
-	
-	.toolbar {
-		color: $toolbar_a !important;
-		background: $toolbar_background !important;
-		border: $toolbar_border !important;
-		a {
-			color: $toolbar_a !important;
-			&:hover { color: $toolbar_a_hover !important; } 
-		} 
-	}
-	
-	// Actual syntax highlighter colors.
-	.plain, .plain a { color: $code_plain !important; }
-	.comments, .comments a { color: $code_comments !important; }
-	.string, .string a { color: $code_string !important; }
-	.keyword { color: $code_keyword !important; }
-	.preprocessor { color: $code_preprocessor !important; }
-	.variable { color: $code_variable !important; }
-	.value { color: $code_value !important; }
-	.functions { color: $code_functions !important; }
-	.constants { color: $code_constants !important; }
-	.script {
-		font-weight: bold !important;
-		color: $code_script !important;
-		background-color: $code_script_background !important;
-	}
-	.color1, .color1 a { color: $code_color1 !important; }
-	.color2, .color2 a { color: $code_color2 !important; }
-	.color3, .color3 a { color: $code_color3 !important; } 
-}
diff --git a/vendor/assets/stylesheets/sh/shCore.css b/vendor/assets/stylesheets/sh/shCore.css
new file mode 100644
index 00000000..c4920e15
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCore.css
@@ -0,0 +1,62 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
diff --git a/vendor/assets/stylesheets/sh/shCore.scss b/vendor/assets/stylesheets/sh/shCore.scss
deleted file mode 100644
index a67e4f90..00000000
--- a/vendor/assets/stylesheets/sh/shCore.scss
+++ /dev/null
@@ -1,216 +0,0 @@
-@mixin round_corners_custom($top, $right, $bottom, $left) {
-	-moz-border-radius: $top $right $bottom $left !important;
-	-webkit-border-radius: $top $right $bottom $left !important;
-}
-
-@mixin round_corners($radius) {
-	@include round_corners_custom($radius, $radius, $radius, $radius);
-}
-
-.syntaxhighlighter {
-	a,
-	div,
-	code,
-	table,
-	table td,
-	table tr,
-	table tbody,
-	table thead,
-	table caption,
-	textarea {
-		@include round_corners(0);
-		
-		background: none !important;
-		border: 0 !important;
-		bottom: auto !important;
-		float: none !important;
-		height: auto !important;
-		left: auto !important;
-		line-height: 1.1em !important;
-		margin: 0 !important;
-		outline: 0 !important;
-		overflow: visible !important;
-		padding: 0 !important;
-		position: static !important;
-		right: auto !important;
-		text-align: left !important;
-		top: auto !important;
-		vertical-align: baseline !important;
-		width: auto !important;
-		box-sizing: content-box !important;
-		font: {
-			family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
-			weight: normal !important;
-			style: normal !important;
-			size: 1em !important;
-		}
-		min: {
-			// For IE8, FF & WebKit
-			height: inherit !important;
-			// For IE7
-			height: auto !important;
-		}
-	}
-}
-
-.syntaxhighlighter {
-	width: 100% !important;
-	margin: 1em 0 1em 0 !important;
-	
-	position: relative !important;
-	overflow: auto !important;
-	font-size: 1em !important;
-	
-	&.source { overflow: hidden !important; }
-	
-	// set up bold and italic
-	.bold { font-weight: bold !important; }
-	.italic { font-style: italic !important; }
-	
-	.line { white-space: pre !important; }
-	
-	// main table and columns
-	table {
-		width: 100% !important;
-		caption {
-			text-align: left !important;
-			padding: .5em 0 0.5em 1em !important;
-		}
-		
-		td.code {
-			width: 100% !important;
-			
-			.container {
-				position: relative !important;
-				
-				textarea {
-					box-sizing: border-box !important;
-					position: absolute !important;
-					left: 0 !important;
-					top: 0 !important;
-					width: 100% !important;
-					height: 100% !important;
-					border: none !important;
-					background: white !important;
-					padding-left: 1em !important;
-					overflow: hidden !important;
-					white-space: pre !important;
-				} 
-			} 
-		}
-		
-		// middle spacing between line numbers and lines
-		td.gutter .line {
-			text-align: right !important;
-			padding: 0 0.5em 0 1em !important; 
-		}
-		
-		td.code .line {
-			padding: 0 1em !important;
-		}
-	}
-	
-	&.nogutter {
-		td.code {
-			.container textarea, .line { padding-left: 0em !important; }
-		}
-	}
-	
-	&.show { display: block !important; }
-	
-	// Adjust some properties when collapsed
-	&.collapsed {
-		table { display: none !important; }
-		
-		.toolbar {
-			padding: 0.1em 0.8em 0em 0.8em !important;
-			font-size: 1em !important;
-			position: static !important;
-			width: auto !important;
-			height: auto !important;
-			
-			span {
-				display: inline !important;
-				margin-right: 1em !important;
-				
-				a {
-					padding: 0 !important;
-					display: none !important;
-					&.expandSource { display: inline !important; } 
-				}
-			}
-		}
-	}
-	
-	// Styles for the toolbar
-	.toolbar {
-		position: absolute !important;
-		right: 1px !important;
-		top: 1px !important;
-		width: 11px !important;
-		height: 11px !important;
-		font-size: 10px !important;
-		z-index: 10 !important;
-		
-		span.title { display: inline !important; }
-		
-		a {
-			display: block !important;
-			text-align: center !important;
-			text-decoration: none !important;
-			padding-top: 1px !important;
-			
-			&.expandSource { display: none !important; }
-		}
-	}
-	
-	&.ie {
-		font-size: .9em !important;
-		padding: 1px 0 1px 0 !important;
-		
-		.toolbar {
-			line-height: 8px !important;
-			a {
-				padding-top: 0px !important;
-			}
-		}
-	}
-	
-	// Print view.
-	// Colors are based on the default theme without background.
-	&.printing {
-		.line.alt1 .content,
-		.line.alt2 .content,
-		.line.highlighted .number,
-		.line.highlighted.alt1 .content,
-		.line.highlighted.alt2 .content { background: none !important; }
-		
-		// Gutter line numbers
-		.line {
-			.number { color: #bbbbbb !important; }
-			// Add border to the lines
-			.content { color: black !important; }
-		}
-		
-		// Toolbar when visible
-		.toolbar { display: none !important; }
-		a { text-decoration: none !important; }
-		.plain, .plain a { color: black !important; }
-		.comments, .comments a { color: #008200 !important; }
-		.string, .string a { color: blue !important; }
-		.keyword {
-			color: #006699 !important;
-			font-weight: bold !important; 
-		}
-		.preprocessor { color: gray !important; }
-		.variable { color: #aa7700 !important; }
-		.value { color: #009900 !important; }
-		.functions { color: #ff1493 !important; }
-		.constants { color: #0066cc !important; }
-		.script { font-weight: bold !important; }
-		.color1, .color1 a { color: gray !important; }
-		.color2, .color2 a { color: #ff1493 !important; }
-		.color3, .color3 a { color: red !important; }
-		.break, .break a { color: black !important; }
-	}
-}
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/sh/shCoreDefault.css b/vendor/assets/stylesheets/sh/shCoreDefault.css
new file mode 100644
index 00000000..51545e47
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreDefault.css
@@ -0,0 +1,94 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:white !important;}
+.syntaxhighlighter .line.alt1{background-color:white !important;}
+.syntaxhighlighter .line.alt2{background-color:white !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#e0e0e0 !important;}
+.syntaxhighlighter .line.highlighted.number{color:black !important;}
+.syntaxhighlighter table caption{color:black !important;}
+.syntaxhighlighter table td.code .container textarea{background:white;color:black;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #6ce26c !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#6ce26c !important;color:white !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:blue !important;background:white !important;border:1px solid #6ce26c !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:blue !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:red !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#6ce26c !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:black !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:black !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#008200 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:blue !important;}
+.syntaxhighlighter .keyword{color:#006699 !important;}
+.syntaxhighlighter .preprocessor{color:grey !important;}
+.syntaxhighlighter .variable{color:#aa7700 !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:deeppink !important;}
+.syntaxhighlighter .constants{color:#0066cc !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#006699 !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:grey !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:deeppink !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:red !important;}
+.syntaxhighlighter .keyword{font-weight:bold !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreDefault.css.scss b/vendor/assets/stylesheets/sh/shCoreDefault.css.scss
deleted file mode 100644
index ff80c7ff..00000000
--- a/vendor/assets/stylesheets/sh/shCoreDefault.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeDefault.scss";
diff --git a/vendor/assets/stylesheets/sh/shCoreDjango.css b/vendor/assets/stylesheets/sh/shCoreDjango.css
new file mode 100644
index 00000000..19d9a97e
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreDjango.css
@@ -0,0 +1,95 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:#0a2b1d !important;}
+.syntaxhighlighter .line.alt1{background-color:#0a2b1d !important;}
+.syntaxhighlighter .line.alt2{background-color:#0a2b1d !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#233729 !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:#f8f8f8 !important;}
+.syntaxhighlighter table td.code .container textarea{background:#0a2b1d;color:#f8f8f8;}
+.syntaxhighlighter .gutter{color:#497958 !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #41a83e !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#41a83e !important;color:#0a2b1d !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#96dd3b !important;background:black !important;border:1px solid #41a83e !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#96dd3b !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:white !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#41a83e !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#ffe862 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:#f8f8f8 !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#336442 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#9df39f !important;}
+.syntaxhighlighter .keyword{color:#96dd3b !important;}
+.syntaxhighlighter .preprocessor{color:#91bb9e !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#f7e741 !important;}
+.syntaxhighlighter .functions{color:#ffaa3e !important;}
+.syntaxhighlighter .constants{color:#e0e8ff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#96dd3b !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#eb939a !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#91bb9e !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#edef7d !important;}
+.syntaxhighlighter .comments{font-style:italic !important;}
+.syntaxhighlighter .keyword{font-weight:bold !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreDjango.css.scss b/vendor/assets/stylesheets/sh/shCoreDjango.css.scss
deleted file mode 100644
index ef572e9d..00000000
--- a/vendor/assets/stylesheets/sh/shCoreDjango.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeDjango.scss";
diff --git a/vendor/assets/stylesheets/sh/shCoreEclipse.css b/vendor/assets/stylesheets/sh/shCoreEclipse.css
new file mode 100644
index 00000000..a1b8730f
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreEclipse.css
@@ -0,0 +1,97 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:white !important;}
+.syntaxhighlighter .line.alt1{background-color:white !important;}
+.syntaxhighlighter .line.alt2{background-color:white !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#c3defe !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:black !important;}
+.syntaxhighlighter table td.code .container textarea{background:white;color:black;}
+.syntaxhighlighter .gutter{color:#787878 !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #d4d0c8 !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#d4d0c8 !important;color:white !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#3f5fbf !important;background:white !important;border:1px solid #d4d0c8 !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#3f5fbf !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#aa7700 !important;}
+.syntaxhighlighter .toolbar{color:#a0a0a0 !important;background:#d4d0c8 !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:#a0a0a0 !important;}
+.syntaxhighlighter .toolbar a:hover{color:red !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:black !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#3f5fbf !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#2a00ff !important;}
+.syntaxhighlighter .keyword{color:#7f0055 !important;}
+.syntaxhighlighter .preprocessor{color:#646464 !important;}
+.syntaxhighlighter .variable{color:#aa7700 !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:deeppink !important;}
+.syntaxhighlighter .constants{color:#0066cc !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#7f0055 !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:grey !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:deeppink !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:red !important;}
+.syntaxhighlighter .keyword{font-weight:bold !important;}
+.syntaxhighlighter .xml .keyword{color:#3f7f7f !important;font-weight:normal !important;}
+.syntaxhighlighter .xml .color1,.syntaxhighlighter .xml .color1 a{color:#7f007f !important;}
+.syntaxhighlighter .xml .string{font-style:italic !important;color:#2a00ff !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreEclipse.css.scss b/vendor/assets/stylesheets/sh/shCoreEclipse.css.scss
deleted file mode 100644
index 9767f537..00000000
--- a/vendor/assets/stylesheets/sh/shCoreEclipse.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeEclipse.scss";
diff --git a/vendor/assets/stylesheets/sh/shCoreEmacs.css b/vendor/assets/stylesheets/sh/shCoreEmacs.css
new file mode 100644
index 00000000..5eddc531
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreEmacs.css
@@ -0,0 +1,93 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:black !important;}
+.syntaxhighlighter .line.alt1{background-color:black !important;}
+.syntaxhighlighter .line.alt2{background-color:black !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#2a3133 !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:lightgrey !important;}
+.syntaxhighlighter table td.code .container textarea{background:black;color:lightgrey;}
+.syntaxhighlighter .gutter{color:lightgrey !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #990000 !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#990000 !important;color:black !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#ebdb8d !important;background:black !important;border:1px solid #990000 !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#ebdb8d !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#ff7d27 !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#990000 !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#9ccff4 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:lightgrey !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#ff7d27 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#ff9e7b !important;}
+.syntaxhighlighter .keyword{color:cyan !important;}
+.syntaxhighlighter .preprocessor{color:#aec4de !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:#81cef9 !important;}
+.syntaxhighlighter .constants{color:#ff9e7b !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:cyan !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#ebdb8d !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#ff7d27 !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#aec4de !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreEmacs.css.scss b/vendor/assets/stylesheets/sh/shCoreEmacs.css.scss
deleted file mode 100644
index 5e466f36..00000000
--- a/vendor/assets/stylesheets/sh/shCoreEmacs.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeEmacs.scss";
diff --git a/vendor/assets/stylesheets/sh/shCoreFadeToGrey.css b/vendor/assets/stylesheets/sh/shCoreFadeToGrey.css
new file mode 100644
index 00000000..76a1bc61
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreFadeToGrey.css
@@ -0,0 +1,94 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:#121212 !important;}
+.syntaxhighlighter .line.alt1{background-color:#121212 !important;}
+.syntaxhighlighter .line.alt2{background-color:#121212 !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#2c2c29 !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:white !important;}
+.syntaxhighlighter table td.code .container textarea{background:#121212;color:white;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #3185b9 !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#3185b9 !important;color:#121212 !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#3185b9 !important;background:black !important;border:1px solid #3185b9 !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#3185b9 !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#d01d33 !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#3185b9 !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#96daff !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:white !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#696854 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#e3e658 !important;}
+.syntaxhighlighter .keyword{color:#d01d33 !important;}
+.syntaxhighlighter .preprocessor{color:#435a5f !important;}
+.syntaxhighlighter .variable{color:#898989 !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:#aaaaaa !important;}
+.syntaxhighlighter .constants{color:#96daff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#d01d33 !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#ffc074 !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#4a8cdb !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#96daff !important;}
+.syntaxhighlighter .functions{font-weight:bold !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreFadeToGrey.css.scss b/vendor/assets/stylesheets/sh/shCoreFadeToGrey.css.scss
deleted file mode 100644
index 46285950..00000000
--- a/vendor/assets/stylesheets/sh/shCoreFadeToGrey.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeFadeToGrey.scss";
diff --git a/vendor/assets/stylesheets/sh/shCoreMDUltra.css b/vendor/assets/stylesheets/sh/shCoreMDUltra.css
new file mode 100644
index 00000000..d7017cbe
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreMDUltra.css
@@ -0,0 +1,93 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:#222222 !important;}
+.syntaxhighlighter .line.alt1{background-color:#222222 !important;}
+.syntaxhighlighter .line.alt2{background-color:#222222 !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#253e5a !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:lime !important;}
+.syntaxhighlighter table td.code .container textarea{background:#222222;color:lime;}
+.syntaxhighlighter .gutter{color:#38566f !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #435a5f !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#435a5f !important;color:#222222 !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#428bdd !important;background:black !important;border:1px solid #435a5f !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#428bdd !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:lime !important;}
+.syntaxhighlighter .toolbar{color:#aaaaff !important;background:#435a5f !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:#aaaaff !important;}
+.syntaxhighlighter .toolbar a:hover{color:#9ccff4 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:lime !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#428bdd !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:lime !important;}
+.syntaxhighlighter .keyword{color:#aaaaff !important;}
+.syntaxhighlighter .preprocessor{color:#8aa6c1 !important;}
+.syntaxhighlighter .variable{color:cyan !important;}
+.syntaxhighlighter .value{color:#f7e741 !important;}
+.syntaxhighlighter .functions{color:#ff8000 !important;}
+.syntaxhighlighter .constants{color:yellow !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#aaaaff !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:red !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:yellow !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#ffaa3e !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreMDUltra.css.scss b/vendor/assets/stylesheets/sh/shCoreMDUltra.css.scss
deleted file mode 100644
index 10ad4c5b..00000000
--- a/vendor/assets/stylesheets/sh/shCoreMDUltra.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeMDUltra.scss";
diff --git a/vendor/assets/stylesheets/sh/shCoreMidnight.css b/vendor/assets/stylesheets/sh/shCoreMidnight.css
new file mode 100644
index 00000000..c3ba16de
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreMidnight.css
@@ -0,0 +1,93 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:#0f192a !important;}
+.syntaxhighlighter .line.alt1{background-color:#0f192a !important;}
+.syntaxhighlighter .line.alt2{background-color:#0f192a !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#253e5a !important;}
+.syntaxhighlighter .line.highlighted.number{color:#38566f !important;}
+.syntaxhighlighter table caption{color:#d1edff !important;}
+.syntaxhighlighter table td.code .container textarea{background:#0f192a;color:#d1edff;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #435a5f !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#435a5f !important;color:#0f192a !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#428bdd !important;background:black !important;border:1px solid #435a5f !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#428bdd !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#1dc116 !important;}
+.syntaxhighlighter .toolbar{color:#d1edff !important;background:#435a5f !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:#d1edff !important;}
+.syntaxhighlighter .toolbar a:hover{color:#8aa6c1 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:#d1edff !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#428bdd !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#1dc116 !important;}
+.syntaxhighlighter .keyword{color:#b43d3d !important;}
+.syntaxhighlighter .preprocessor{color:#8aa6c1 !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#f7e741 !important;}
+.syntaxhighlighter .functions{color:#ffaa3e !important;}
+.syntaxhighlighter .constants{color:#e0e8ff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#b43d3d !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#f8bb00 !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:white !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#ffaa3e !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreMidnight.css.scss b/vendor/assets/stylesheets/sh/shCoreMidnight.css.scss
deleted file mode 100644
index e357eb28..00000000
--- a/vendor/assets/stylesheets/sh/shCoreMidnight.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeMidnight.scss";
diff --git a/vendor/assets/stylesheets/sh/shCoreRDark.css b/vendor/assets/stylesheets/sh/shCoreRDark.css
new file mode 100644
index 00000000..958735eb
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shCoreRDark.css
@@ -0,0 +1,93 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter table,.syntaxhighlighter table td,.syntaxhighlighter table tr,.syntaxhighlighter table tbody,.syntaxhighlighter table thead,.syntaxhighlighter table caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0 !important;-webkit-border-radius:0 0 0 0 !important;background:none !important;border:0 !important;bottom:auto !important;float:none !important;height:auto !important;left:auto !important;line-height:1.1em !important;margin:0 !important;outline:0 !important;overflow:visible !important;padding:0 !important;position:static !important;right:auto !important;text-align:left !important;top:auto !important;vertical-align:baseline !important;width:auto !important;box-sizing:content-box !important;font-family:"Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace !important;font-weight:normal !important;font-style:normal !important;font-size:1em !important;min-height:inherit !important;min-height:auto !important;}
+.syntaxhighlighter{width:100% !important;margin:1em 0 1em 0 !important;position:relative !important;overflow:auto !important;font-size:1em !important;}
+.syntaxhighlighter.source{overflow:hidden !important;}
+.syntaxhighlighter .bold{font-weight:bold !important;}
+.syntaxhighlighter .italic{font-style:italic !important;}
+.syntaxhighlighter .line{white-space:pre !important;}
+.syntaxhighlighter table{width:100% !important;}
+.syntaxhighlighter table caption{text-align:left !important;padding:0.5em 0 0.5em 1em !important;}
+.syntaxhighlighter table td.code{width:100% !important;}
+.syntaxhighlighter table td.code .container{position:relative !important;}
+.syntaxhighlighter table td.code .container textarea{box-sizing:border-box !important;position:absolute !important;left:0 !important;top:0 !important;width:100% !important;height:100% !important;border:none !important;background:white !important;padding-left:1em !important;overflow:hidden !important;white-space:pre !important;}
+.syntaxhighlighter table td.gutter .line{text-align:right !important;padding:0 0.5em 0 1em !important;}
+.syntaxhighlighter table td.code .line{padding:0 1em !important;}
+.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0em !important;}
+.syntaxhighlighter.show{display:block !important;}
+.syntaxhighlighter.collapsed table{display:none !important;}
+.syntaxhighlighter.collapsed .toolbar{padding:0.1em 0.8em 0em 0.8em !important;font-size:1em !important;position:static !important;width:auto !important;height:auto !important;}
+.syntaxhighlighter.collapsed .toolbar span{display:inline !important;margin-right:1em !important;}
+.syntaxhighlighter.collapsed .toolbar span a{padding:0 !important;display:none !important;}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline !important;}
+.syntaxhighlighter .toolbar{position:absolute !important;right:1px !important;top:1px !important;width:11px !important;height:11px !important;font-size:10px !important;z-index:10 !important;}
+.syntaxhighlighter .toolbar span.title{display:inline !important;}
+.syntaxhighlighter .toolbar a{display:block !important;text-align:center !important;text-decoration:none !important;padding-top:1px !important;}
+.syntaxhighlighter .toolbar a.expandSource{display:none !important;}
+.syntaxhighlighter.ie{font-size:0.9em !important;padding:1px 0 1px 0 !important;}
+.syntaxhighlighter.ie .toolbar{line-height:8px !important;}
+.syntaxhighlighter.ie .toolbar a{padding-top:0px !important;}
+.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none !important;}
+.syntaxhighlighter.printing .line .number{color:#bbbbbb !important;}
+.syntaxhighlighter.printing .line .content{color:black !important;}
+.syntaxhighlighter.printing .toolbar{display:none !important;}
+.syntaxhighlighter.printing a{text-decoration:none !important;}
+.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black !important;}
+.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200 !important;}
+.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue !important;}
+.syntaxhighlighter.printing .keyword{color:#006699 !important;font-weight:bold !important;}
+.syntaxhighlighter.printing .preprocessor{color:gray !important;}
+.syntaxhighlighter.printing .variable{color:#aa7700 !important;}
+.syntaxhighlighter.printing .value{color:#009900 !important;}
+.syntaxhighlighter.printing .functions{color:deeppink !important;}
+.syntaxhighlighter.printing .constants{color:#0066cc !important;}
+.syntaxhighlighter.printing .script{font-weight:bold !important;}
+.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray !important;}
+.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:deeppink !important;}
+.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red !important;}
+.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black !important;}
+.syntaxhighlighter{background-color:#1b2426 !important;}
+.syntaxhighlighter .line.alt1{background-color:#1b2426 !important;}
+.syntaxhighlighter .line.alt2{background-color:#1b2426 !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#323e41 !important;}
+.syntaxhighlighter .line.highlighted.number{color:#b9bdb6 !important;}
+.syntaxhighlighter table caption{color:#b9bdb6 !important;}
+.syntaxhighlighter table td.code .container textarea{background:#1b2426;color:#b9bdb6;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #435a5f !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#435a5f !important;color:#1b2426 !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#5ba1cf !important;background:black !important;border:1px solid #435a5f !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#5ba1cf !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#5ce638 !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#435a5f !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#e0e8ff !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:#b9bdb6 !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#878a85 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#5ce638 !important;}
+.syntaxhighlighter .keyword{color:#5ba1cf !important;}
+.syntaxhighlighter .preprocessor{color:#435a5f !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:#ffaa3e !important;}
+.syntaxhighlighter .constants{color:#e0e8ff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#5ba1cf !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#e0e8ff !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:white !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#ffaa3e !important;}
diff --git a/vendor/assets/stylesheets/sh/shCoreRDark.css.scss b/vendor/assets/stylesheets/sh/shCoreRDark.css.scss
deleted file mode 100644
index 5c26da34..00000000
--- a/vendor/assets/stylesheets/sh/shCoreRDark.css.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "shCore.scss";
-@import "shThemeRDark.scss";
diff --git a/vendor/assets/stylesheets/sh/shThemeDefault.css b/vendor/assets/stylesheets/sh/shThemeDefault.css
new file mode 100644
index 00000000..9b931103
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeDefault.css
@@ -0,0 +1,48 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:white !important;}
+.syntaxhighlighter .line.alt1{background-color:white !important;}
+.syntaxhighlighter .line.alt2{background-color:white !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#e0e0e0 !important;}
+.syntaxhighlighter .line.highlighted.number{color:black !important;}
+.syntaxhighlighter table caption{color:black !important;}
+.syntaxhighlighter table td.code .container textarea{background:white;color:black;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #6ce26c !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#6ce26c !important;color:white !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:blue !important;background:white !important;border:1px solid #6ce26c !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:blue !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:red !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#6ce26c !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:black !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:black !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#008200 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:blue !important;}
+.syntaxhighlighter .keyword{color:#006699 !important;}
+.syntaxhighlighter .preprocessor{color:grey !important;}
+.syntaxhighlighter .variable{color:#aa7700 !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:deeppink !important;}
+.syntaxhighlighter .constants{color:#0066cc !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#006699 !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:grey !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:deeppink !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:red !important;}
+.syntaxhighlighter .keyword{font-weight:bold !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeDefault.scss b/vendor/assets/stylesheets/sh/shThemeDefault.scss
deleted file mode 100644
index 1574dae8..00000000
--- a/vendor/assets/stylesheets/sh/shThemeDefault.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// Default Syntax Highlighter theme.
-
-@import "_theme_template.scss";
-
-.syntaxhighlighter {
-	.keyword { font-weight: bold !important; }
-}
diff --git a/vendor/assets/stylesheets/sh/shThemeDjango.css b/vendor/assets/stylesheets/sh/shThemeDjango.css
new file mode 100644
index 00000000..52e87428
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeDjango.css
@@ -0,0 +1,49 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:#0a2b1d !important;}
+.syntaxhighlighter .line.alt1{background-color:#0a2b1d !important;}
+.syntaxhighlighter .line.alt2{background-color:#0a2b1d !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#233729 !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:#f8f8f8 !important;}
+.syntaxhighlighter table td.code .container textarea{background:#0a2b1d;color:#f8f8f8;}
+.syntaxhighlighter .gutter{color:#497958 !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #41a83e !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#41a83e !important;color:#0a2b1d !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#96dd3b !important;background:black !important;border:1px solid #41a83e !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#96dd3b !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:white !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#41a83e !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#ffe862 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:#f8f8f8 !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#336442 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#9df39f !important;}
+.syntaxhighlighter .keyword{color:#96dd3b !important;}
+.syntaxhighlighter .preprocessor{color:#91bb9e !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#f7e741 !important;}
+.syntaxhighlighter .functions{color:#ffaa3e !important;}
+.syntaxhighlighter .constants{color:#e0e8ff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#96dd3b !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#eb939a !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#91bb9e !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#edef7d !important;}
+.syntaxhighlighter .comments{font-style:italic !important;}
+.syntaxhighlighter .keyword{font-weight:bold !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeDjango.css.scss b/vendor/assets/stylesheets/sh/shThemeDjango.css.scss
deleted file mode 100644
index 8e95c567..00000000
--- a/vendor/assets/stylesheets/sh/shThemeDjango.css.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-// Django SyntaxHighlighter theme
-
-$background:					#0a2b1d !default;
-
-$line_highlighted_background:	#233729 !default;
-$line_highlighted_number:		white !default;
-
-$gutter_text:					#497958 !default;
-$gutter_border_color:			#41a83e !default;
-
-$toolbar_collapsed_a:			#96dd3b !default;
-$toolbar_collapsed_a_hover:		#fff !default;
-$toolbar_collapsed_background:	#000 !default;
-
-$toolbar_a:						#fff !default;
-$toolbar_a_hover:				#ffe862 !default;
-
-$code_plain:					#f8f8f8 !default;
-$code_comments:					#336442 !default;
-$code_string:					#9df39f !default;
-$code_keyword:					#96dd3b !default;
-$code_preprocessor:				#91bb9e !default;
-$code_variable:					#ffaa3e !default;
-$code_value:					#f7e741 !default;
-$code_functions:				#ffaa3e !default;
-$code_constants:				#e0e8ff !default;
-$code_color1:					#eb939a !default;
-$code_color2:					#91bb9e !default;
-$code_color3:					#edef7d !default;
-
-@import "_theme_template.scss";
-
-.syntaxhighlighter {
-	.comments { font-style: italic !important; }
-	.keyword { font-weight: bold !important; } 
-}
diff --git a/vendor/assets/stylesheets/sh/shThemeEclipse.css b/vendor/assets/stylesheets/sh/shThemeEclipse.css
new file mode 100644
index 00000000..24511b5c
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeEclipse.css
@@ -0,0 +1,51 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:white !important;}
+.syntaxhighlighter .line.alt1{background-color:white !important;}
+.syntaxhighlighter .line.alt2{background-color:white !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#c3defe !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:black !important;}
+.syntaxhighlighter table td.code .container textarea{background:white;color:black;}
+.syntaxhighlighter .gutter{color:#787878 !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #d4d0c8 !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#d4d0c8 !important;color:white !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#3f5fbf !important;background:white !important;border:1px solid #d4d0c8 !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#3f5fbf !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#aa7700 !important;}
+.syntaxhighlighter .toolbar{color:#a0a0a0 !important;background:#d4d0c8 !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:#a0a0a0 !important;}
+.syntaxhighlighter .toolbar a:hover{color:red !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:black !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#3f5fbf !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#2a00ff !important;}
+.syntaxhighlighter .keyword{color:#7f0055 !important;}
+.syntaxhighlighter .preprocessor{color:#646464 !important;}
+.syntaxhighlighter .variable{color:#aa7700 !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:deeppink !important;}
+.syntaxhighlighter .constants{color:#0066cc !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#7f0055 !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:grey !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:deeppink !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:red !important;}
+.syntaxhighlighter .keyword{font-weight:bold !important;}
+.syntaxhighlighter .xml .keyword{color:#3f7f7f !important;font-weight:normal !important;}
+.syntaxhighlighter .xml .color1,.syntaxhighlighter .xml .color1 a{color:#7f007f !important;}
+.syntaxhighlighter .xml .string{font-style:italic !important;color:#2a00ff !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeEclipse.css.scss b/vendor/assets/stylesheets/sh/shThemeEclipse.css.scss
deleted file mode 100644
index 193fb1d8..00000000
--- a/vendor/assets/stylesheets/sh/shThemeEclipse.css.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-// Eclipse IDE SyntaxHighlighter color theme
-// (C) Code-House
-// :http//blog.code-house.org/2009/10/xml-i-adnotacje-kod-ogolnego-przeznaczenia-i-jpa/
-
-$background:					#fff !default;
-
-$line_highlighted_background:	#c3defe !default;
-$line_highlighted_number:		#fff !default;
-
-$gutter_text:					#787878 !default;
-$gutter_border_color:			#d4d0c8 !default;
-
-$toolbar_collapsed_a:			#3f5fbf !default;
-$toolbar_collapsed_a_hover:		#aa7700 !default;
-$toolbar_collapsed_background:	#fff !default;
-
-$toolbar_a:						#a0a0a0 !default;
-$toolbar_a_hover:				red !default;
-
-$code_plain:					black !default;
-$code_comments:					#3f5fbf !default;
-$code_string:					#2a00ff !default;
-$code_keyword:					#7f0055 !default;
-$code_preprocessor:				#646464 !default;
-$code_variable:					#aa7700 !default;
-$code_value:					#009900 !default;
-$code_functions:				#ff1493 !default;
-$code_constants:				#0066cc !default;
-$code_color1:					gray !default;
-$code_color2:					#ff1493 !default;
-$code_color3:					red !default;
-
-@import "_theme_template.scss";
-
-.syntaxhighlighter {
-	.keyword { font-weight: bold !important; }
-	
-	.xml {
-		.keyword {
-			color: #3f7f7f !important;
-			font-weight: normal !important; }
-		.color1, .color1 a { color: #7f007f !important; }
-		.string {
-			font-style: italic !important;
-			color: #2a00ff !important; 
-		} 
-	} 
-}
diff --git a/vendor/assets/stylesheets/sh/shThemeEmacs.css b/vendor/assets/stylesheets/sh/shThemeEmacs.css
new file mode 100644
index 00000000..b30d0a1a
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeEmacs.css
@@ -0,0 +1,47 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:black !important;}
+.syntaxhighlighter .line.alt1{background-color:black !important;}
+.syntaxhighlighter .line.alt2{background-color:black !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#2a3133 !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:lightgrey !important;}
+.syntaxhighlighter table td.code .container textarea{background:black;color:lightgrey;}
+.syntaxhighlighter .gutter{color:lightgrey !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #990000 !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#990000 !important;color:black !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#ebdb8d !important;background:black !important;border:1px solid #990000 !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#ebdb8d !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#ff7d27 !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#990000 !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#9ccff4 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:lightgrey !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#ff7d27 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#ff9e7b !important;}
+.syntaxhighlighter .keyword{color:cyan !important;}
+.syntaxhighlighter .preprocessor{color:#aec4de !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:#81cef9 !important;}
+.syntaxhighlighter .constants{color:#ff9e7b !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:cyan !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#ebdb8d !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#ff7d27 !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#aec4de !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeEmacs.css.scss b/vendor/assets/stylesheets/sh/shThemeEmacs.css.scss
deleted file mode 100644
index 11c9deb4..00000000
--- a/vendor/assets/stylesheets/sh/shThemeEmacs.css.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-// Emacs SyntaxHighlighter theme based on theme by Joshua Emmons
-// http://www.skia.net/
-
-$background:					black !default;
-
-$line_highlighted_background:	#2A3133 !default;
-$line_highlighted_number:		white !default;
-
-$gutter_text:					#d3d3d3 !default;
-$gutter_border_color:			#990000 !default;
-
-$toolbar_collapsed_a:			#ebdb8d !default;
-$toolbar_collapsed_a_hover:		#ff7d27 !default;
-$toolbar_collapsed_background:	black !default;
-
-$toolbar_a:						#fff !default;
-$toolbar_a_hover:				#9ccff4 !default;
-
-$code_plain:					#d3d3d3 !default;
-$code_comments:					#ff7d27 !default;
-$code_string:					#ff9e7b !default;
-$code_keyword:					aqua !default;
-$code_preprocessor:				#aec4de !default;
-$code_variable:					#ffaa3e !default;
-$code_value:					#009900 !default;
-$code_functions:				#81cef9 !default;
-$code_constants:				#ff9e7b !default;
-$code_color1:					#ebdb8d !default;
-$code_color2:					#ff7d27 !default;
-$code_color3:					#aec4de !default;
-
-@import "_theme_template.scss";
diff --git a/vendor/assets/stylesheets/sh/shThemeFadeToGrey.css b/vendor/assets/stylesheets/sh/shThemeFadeToGrey.css
new file mode 100644
index 00000000..35092d23
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeFadeToGrey.css
@@ -0,0 +1,48 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:#121212 !important;}
+.syntaxhighlighter .line.alt1{background-color:#121212 !important;}
+.syntaxhighlighter .line.alt2{background-color:#121212 !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#2c2c29 !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:white !important;}
+.syntaxhighlighter table td.code .container textarea{background:#121212;color:white;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #3185b9 !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#3185b9 !important;color:#121212 !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#3185b9 !important;background:black !important;border:1px solid #3185b9 !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#3185b9 !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#d01d33 !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#3185b9 !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#96daff !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:white !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#696854 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#e3e658 !important;}
+.syntaxhighlighter .keyword{color:#d01d33 !important;}
+.syntaxhighlighter .preprocessor{color:#435a5f !important;}
+.syntaxhighlighter .variable{color:#898989 !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:#aaaaaa !important;}
+.syntaxhighlighter .constants{color:#96daff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#d01d33 !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#ffc074 !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#4a8cdb !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#96daff !important;}
+.syntaxhighlighter .functions{font-weight:bold !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeFadeToGrey.css.scss b/vendor/assets/stylesheets/sh/shThemeFadeToGrey.css.scss
deleted file mode 100644
index 79638149..00000000
--- a/vendor/assets/stylesheets/sh/shThemeFadeToGrey.css.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-// Fade to Grey SyntaxHighlighter theme based on theme by Brasten Sager
-// :http//www.ibrasten.com/
-
-$background:					#121212 !default;
-
-$line_highlighted_background:	#2C2C29 !default;
-$line_highlighted_number:		white !default;
-
-$gutter_text:					#afafaf !default;
-$gutter_border_color:			#3185b9 !default;
-
-$toolbar_collapsed_a:			#3185b9 !default;
-$toolbar_collapsed_a_hover:		#d01d33 !default;
-$toolbar_collapsed_background:	black !default;
-
-$toolbar_a:						#fff !default;
-$toolbar_a_hover:				#96daff !default;
-
-$code_plain:					white !default;
-$code_comments:					#696854 !default;
-$code_string:					#e3e658 !default;
-$code_keyword:					#d01d33 !default;
-$code_preprocessor:				#435a5f !default;
-$code_variable:					#898989 !default;
-$code_value:					#009900 !default;
-$code_functions:				#aaaaaa !default;
-$code_constants:				#96daff !default;
-$code_color1:					#ffc074 !default;
-$code_color2:					#4a8cdb !default;
-$code_color3:					#96daff !default;
-
-@import "_theme_template.scss";
-
-.syntaxhighlighter {
-  .functions { font-weight: bold !important; }
-}
diff --git a/vendor/assets/stylesheets/sh/shThemeMDUltra.css b/vendor/assets/stylesheets/sh/shThemeMDUltra.css
new file mode 100644
index 00000000..e11f4395
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeMDUltra.css
@@ -0,0 +1,47 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:#222222 !important;}
+.syntaxhighlighter .line.alt1{background-color:#222222 !important;}
+.syntaxhighlighter .line.alt2{background-color:#222222 !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#253e5a !important;}
+.syntaxhighlighter .line.highlighted.number{color:white !important;}
+.syntaxhighlighter table caption{color:lime !important;}
+.syntaxhighlighter table td.code .container textarea{background:#222222;color:lime;}
+.syntaxhighlighter .gutter{color:#38566f !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #435a5f !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#435a5f !important;color:#222222 !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#428bdd !important;background:black !important;border:1px solid #435a5f !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#428bdd !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:lime !important;}
+.syntaxhighlighter .toolbar{color:#aaaaff !important;background:#435a5f !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:#aaaaff !important;}
+.syntaxhighlighter .toolbar a:hover{color:#9ccff4 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:lime !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#428bdd !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:lime !important;}
+.syntaxhighlighter .keyword{color:#aaaaff !important;}
+.syntaxhighlighter .preprocessor{color:#8aa6c1 !important;}
+.syntaxhighlighter .variable{color:cyan !important;}
+.syntaxhighlighter .value{color:#f7e741 !important;}
+.syntaxhighlighter .functions{color:#ff8000 !important;}
+.syntaxhighlighter .constants{color:yellow !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#aaaaff !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:red !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:yellow !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#ffaa3e !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeMDUltra.css.scss b/vendor/assets/stylesheets/sh/shThemeMDUltra.css.scss
deleted file mode 100644
index 0356fa6c..00000000
--- a/vendor/assets/stylesheets/sh/shThemeMDUltra.css.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-// MDUltra SyntaxHighlighter theme based on Midnight Theme
-// http://www.mddev.co.uk/
-
-$background:					#222222 !default;
-
-$line_highlighted_background:	#253e5a !default;
-$line_highlighted_number:		white !default;
-
-$gutter_text:					#38566f !default;
-$gutter_border_color:			#435a5f !default;
-
-$toolbar_collapsed_a:			#428bdd !default;
-$toolbar_collapsed_a_hover:		lime !default;
-$toolbar_collapsed_background:	black !default;
-
-$toolbar_a:						#aaaaff !default;
-$toolbar_a_hover:				#9ccff4 !default;
-
-$code_plain:					lime !default;
-$code_comments:					#428bdd !default;
-$code_string:					lime !default;
-$code_keyword:					#aaaaff !default;
-$code_preprocessor:				#8aa6c1 !default;
-$code_variable:					aqua !default;
-$code_value:					#f7e741 !default;
-$code_functions:				#ff8000 !default;
-$code_constants:				yellow !default;
-$code_color1:					red !default;
-$code_color2:					yellow !default;
-$code_color3:					#ffaa3e !default;
-
-@import "_theme_template.scss";
diff --git a/vendor/assets/stylesheets/sh/shThemeMidnight.css b/vendor/assets/stylesheets/sh/shThemeMidnight.css
new file mode 100644
index 00000000..d9786f99
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeMidnight.css
@@ -0,0 +1,47 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:#0f192a !important;}
+.syntaxhighlighter .line.alt1{background-color:#0f192a !important;}
+.syntaxhighlighter .line.alt2{background-color:#0f192a !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#253e5a !important;}
+.syntaxhighlighter .line.highlighted.number{color:#38566f !important;}
+.syntaxhighlighter table caption{color:#d1edff !important;}
+.syntaxhighlighter table td.code .container textarea{background:#0f192a;color:#d1edff;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #435a5f !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#435a5f !important;color:#0f192a !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#428bdd !important;background:black !important;border:1px solid #435a5f !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#428bdd !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#1dc116 !important;}
+.syntaxhighlighter .toolbar{color:#d1edff !important;background:#435a5f !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:#d1edff !important;}
+.syntaxhighlighter .toolbar a:hover{color:#8aa6c1 !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:#d1edff !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#428bdd !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#1dc116 !important;}
+.syntaxhighlighter .keyword{color:#b43d3d !important;}
+.syntaxhighlighter .preprocessor{color:#8aa6c1 !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#f7e741 !important;}
+.syntaxhighlighter .functions{color:#ffaa3e !important;}
+.syntaxhighlighter .constants{color:#e0e8ff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#b43d3d !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#f8bb00 !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:white !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#ffaa3e !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeMidnight.css.scss b/vendor/assets/stylesheets/sh/shThemeMidnight.css.scss
deleted file mode 100644
index a4dae023..00000000
--- a/vendor/assets/stylesheets/sh/shThemeMidnight.css.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-// Midnight SyntaxHighlighter theme based on theme by J.D. Myers
-// http://webdesign.lsnjd.com/
-
-$background:					#0f192a !default;
-
-$line_highlighted_background:	#253e5a !default;
-$line_highlighted_number:		#38566f !default;
-
-$gutter_text:					#afafaf !default;
-$gutter_border_color:			#435a5f !default;
-
-$toolbar_collapsed_a:			#428bdd !default;
-$toolbar_collapsed_a_hover:		#1dc116 !default;
-$toolbar_collapsed_background:	#000 !default;
-
-$toolbar_a:						#D1EDFF !default;
-$toolbar_a_hover:				#8aa6c1 !default;
-
-$code_plain:					#d1edff !default;
-$code_comments:					#428bdd !default;
-$code_string:					#1dc116 !default;
-$code_keyword:					#b43d3d !default;
-$code_preprocessor:				#8aa6c1 !default;
-$code_variable:					#ffaa3e !default;
-$code_value:					#f7e741 !default;
-$code_functions:				#ffaa3e !default;
-$code_constants:				#e0e8ff !default;
-$code_color1:					#f8bb00 !default;
-$code_color2:					white !default;
-$code_color3:					#ffaa3e !default;
-
-@import "_theme_template.scss";
diff --git a/vendor/assets/stylesheets/sh/shThemeRDark.css b/vendor/assets/stylesheets/sh/shThemeRDark.css
new file mode 100644
index 00000000..2d76f386
--- /dev/null
+++ b/vendor/assets/stylesheets/sh/shThemeRDark.css
@@ -0,0 +1,47 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (Wed, 12 Feb 2014 03:42:24 GMT)
+ *
+ * @copyright
+ * Copyright (C) 2004-2013 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter{background-color:#1b2426 !important;}
+.syntaxhighlighter .line.alt1{background-color:#1b2426 !important;}
+.syntaxhighlighter .line.alt2{background-color:#1b2426 !important;}
+.syntaxhighlighter .line.highlighted.alt1,.syntaxhighlighter .line.highlighted.alt2{background-color:#323e41 !important;}
+.syntaxhighlighter .line.highlighted.number{color:#b9bdb6 !important;}
+.syntaxhighlighter table caption{color:#b9bdb6 !important;}
+.syntaxhighlighter table td.code .container textarea{background:#1b2426;color:#b9bdb6;}
+.syntaxhighlighter .gutter{color:#afafaf !important;}
+.syntaxhighlighter .gutter .line{border-right:3px solid #435a5f !important;}
+.syntaxhighlighter .gutter .line.highlighted{background-color:#435a5f !important;color:#1b2426 !important;}
+.syntaxhighlighter.printing .line .content{border:none !important;}
+.syntaxhighlighter.collapsed{overflow:visible !important;}
+.syntaxhighlighter.collapsed .toolbar{color:#5ba1cf !important;background:black !important;border:1px solid #435a5f !important;}
+.syntaxhighlighter.collapsed .toolbar a{color:#5ba1cf !important;}
+.syntaxhighlighter.collapsed .toolbar a:hover{color:#5ce638 !important;}
+.syntaxhighlighter .toolbar{color:white !important;background:#435a5f !important;border:none !important;}
+.syntaxhighlighter .toolbar a{color:white !important;}
+.syntaxhighlighter .toolbar a:hover{color:#e0e8ff !important;}
+.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:#b9bdb6 !important;}
+.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#878a85 !important;}
+.syntaxhighlighter .string,.syntaxhighlighter .string a{color:#5ce638 !important;}
+.syntaxhighlighter .keyword{color:#5ba1cf !important;}
+.syntaxhighlighter .preprocessor{color:#435a5f !important;}
+.syntaxhighlighter .variable{color:#ffaa3e !important;}
+.syntaxhighlighter .value{color:#009900 !important;}
+.syntaxhighlighter .functions{color:#ffaa3e !important;}
+.syntaxhighlighter .constants{color:#e0e8ff !important;}
+.syntaxhighlighter .script{font-weight:bold !important;color:#5ba1cf !important;background-color:none !important;}
+.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:#e0e8ff !important;}
+.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:white !important;}
+.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:#ffaa3e !important;}
diff --git a/vendor/assets/stylesheets/sh/shThemeRDark.css.scss b/vendor/assets/stylesheets/sh/shThemeRDark.css.scss
deleted file mode 100644
index 3b67b153..00000000
--- a/vendor/assets/stylesheets/sh/shThemeRDark.css.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-// RDark SyntaxHighlighter theme based on theme by Radu Dineiu
-// http://www.vim.org/scripts/script.php?script_id=1732
-
-$background:					#1b2426 !default;
-
-$line_highlighted_background:	#323E41 !default;
-$line_highlighted_number:		#b9bdb6 !default;
-
-$gutter_text:					#afafaf !default;
-$gutter_border_color:			#435a5f !default;
-
-$toolbar_collapsed_a:			#5ba1cf !default;
-$toolbar_collapsed_a_hover:		#5ce638 !default;
-$toolbar_collapsed_background:	#000 !default;
-
-$toolbar_a:						#fff !default;
-$toolbar_a_hover:				#e0e8ff !default;
-
-$code_plain:					#b9bdb6 !default;
-$code_comments:					#878a85 !default;
-$code_string:					#5ce638 !default;
-$code_keyword:					#5ba1cf !default;
-$code_preprocessor:				#435a5f !default;
-$code_variable:					#ffaa3e !default;
-$code_value:					#009900 !default;
-$code_functions:				#ffaa3e !default;
-$code_constants:				#e0e8ff !default;
-$code_color1:					#e0e8ff !default;
-$code_color2:					white !default;
-$code_color3:					#ffaa3e !default;
-
-@import "_theme_template.scss";
diff --git a/vendor/configoro/base.rb b/vendor/configoro/base.rb
new file mode 100644
index 00000000..caf710dd
--- /dev/null
+++ b/vendor/configoro/base.rb
@@ -0,0 +1,73 @@
+# This module handles initialization of the Configoro object, and contains some
+# utility methods.
+
+module Configoro
+
+  # Creates the configuration dictionary and stores it under
+  # `MyApp::Configuration` (assuming an application named `MyApp`).
+
+  def self.initialize
+    namespace.const_set :Configuration, load_environment(Rails.env)
+  end
+
+  # The search paths Configoro uses to locate configuration files. By default
+  # this list contains one item, `RAILS_ROOT/config/environments`. You can edit
+  # this list to add your own search paths. Any such paths should have
+  # subdirectories for each environment, and `common`, as expected by Configoro.
+  #
+  # Be sure to add paths before the Configoro initializer is called (see the
+  # example).
+  #
+  # Paths are processed in the order they appear in this array.
+  #
+  # @return [Array<String>] An editable array of search paths.
+  #
+  # @example Adding additional paths (application.rn)
+  #   config.before_initialize do
+  #     Configoro.paths << '/my/custom/path'
+  #   end
+
+  def self.paths
+    @paths ||= begin
+      paths = []
+      paths << "#{Rails.root}/config/environments" if defined?(Rails)
+      paths
+    end
+  end
+
+  # Resets any custom configuration paths set using {.paths}.
+
+  def self.reset_paths
+    remove_instance_variable :@paths
+  end
+
+  # Loads the configuration for an environment and returns it as a {Hash}. Use
+  # this method to access Configoro options outside the context of your Rails
+  # app. You will need to configure paths first (see example).
+  #
+  # @param [String] env The Rails environment.
+  # @return [Configoro::Hash] The configuration for that environment.
+  #
+  # @example Accessing Configoro options outside of Rails
+  #   Configoro.paths << "#{rails_root}/config/environments"
+  #   Configoro.load_environment(rails_env) #=> { ... }
+
+  def self.load_environment(env)
+    config = Configoro::Hash.new
+    load_data config, env
+    config
+  end
+
+  private
+
+  def self.namespace
+    Object.const_get Rails.application.class.to_s.split('::').first
+  end
+
+  def self.load_data(config, env)
+    paths.each do |path|
+      Dir.glob("#{path}/common/*.yml").sort.each { |file| config << file }
+      Dir.glob("#{path}/#{env}/*.yml").sort.each { |file| config << file }
+    end
+  end
+end
diff --git a/vendor/configoro/hash.rb b/vendor/configoro/hash.rb
new file mode 100644
index 00000000..c77e117f
--- /dev/null
+++ b/vendor/configoro/hash.rb
@@ -0,0 +1,160 @@
+module Configoro
+  class Hash < HashWithIndifferentAccess
+
+    # @private
+    def initialize(hsh={})
+      if hsh.kind_of?(::Hash) then
+        super()
+        update hsh
+      else
+        super
+      end
+    end
+
+    # Deep-merges additional hash entries into this hash.
+    #
+    # @return [Configoro::Hash] This object.
+    # @overload <<(hash)
+    #   Adds the entries from another hash.
+    #   @param [::Hash] hash The additional keys to add.
+    # @overload <<(path)
+    #   Adds the entries from a YAML file. The entries will be added under a
+    #   sub-hash named after the YAML file's name.
+    #   @param [String] path The path to a YAML file ending in ".yml".
+    #   @raise [ArgumentError] If the filename does not end in ".yml".
+
+    def <<(hsh_or_path)
+      case hsh_or_path
+        when String
+          raise ArgumentError, "Only files ending in .yml can be added" unless File.extname(hsh_or_path) == '.yml'
+          return self unless File.exist?(hsh_or_path)
+          data = load_preprocessed_yaml(hsh_or_path)
+          deep_merge! File.basename(hsh_or_path, ".yml") => data
+        when ::Hash
+          deep_merge! hsh_or_path
+      end
+    end
+
+    alias_method :push, :<<
+
+    # @private
+    def dup
+      Hash.new(self)
+    end
+
+    # Recursively merges this hash with another hash. All nested hashes are forced
+    # to be `Configoro::Hash` instances.
+    #
+    # @param [::Hash] other_hash The hash to merge into this one.
+    # @return [Configoro::Hash] This object.
+
+    def deep_merge!(other_hash)
+      other_hash.each_pair do |k, v|
+        tv      = self[k]
+        self[k] = if v.kind_of?(::Hash) then
+                    if tv.kind_of?(::Hash) then
+                      Configoro::Hash.new(tv).deep_merge!(v)
+                    else
+                      Configoro::Hash.new(v)
+                    end
+                  else
+                    v
+                  end
+      end
+      self
+    end
+
+    # @private
+    #
+    # To optimize access, we create a getter method every time we encounter a
+    # key that exists in the hash. If the key is later deleted, the method will
+    # be removed.
+
+    def method_missing(meth, *args)
+      if include?(meth.to_s) then
+        if args.empty? then
+          create_getter meth
+        else
+          raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"
+        end
+      elsif meth.to_s =~ /^(.+)\?$/ and include?(root_meth = $1) then
+        if args.empty? then
+          !!create_getter(root_meth) #TODO duplication of logic
+        else
+          raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"
+        end
+      else
+        super
+      end
+    end
+
+    # @private
+    def inspect
+      "#{to_hash.inspect}:#{self.class.to_s}"
+    end
+
+    protected
+
+    def self.new_from_hash_copying_default(hash)
+      Configoro::Hash.new(hash).tap do |new_hash|
+        new_hash.default = hash.default
+      end
+    end
+
+    def convert_value(value, options={})
+      if value.is_a? ::Hash
+        if options[:for] == :to_hash
+          value.to_hash
+        else
+          #value.nested_under_indifferent_access
+          self.class.new_from_hash_copying_default(value)
+        end
+      elsif value.is_a?(Array)
+        unless options[:for] == :assignment
+          value = value.dup
+        end
+        value.map! { |e| convert_value(e, options) }
+      else
+        value
+      end
+    end
+
+    private
+
+    def create_getter(meth)
+      singleton_class.send(:define_method, meth) do
+        if include?(meth.to_s) then
+          self[meth.to_s]
+        else
+          remove_getter meth
+        end
+      end
+
+      singleton_class.send(:define_method, :"#{meth}?") do
+        if include?(meth.to_s) then
+          !!self[meth.to_s]
+        else
+          remove_getter meth
+        end
+      end
+
+      self[meth.to_s]
+    end
+
+    def remove_getter(meth)
+      if methods.include?(meth.to_sym) then
+        instance_eval "undef #{meth.to_sym.inspect}"
+      end
+
+      if methods.include?(:"#{meth}?") then
+        instance_eval "undef #{:"#{meth}?".inspect}"
+      end
+
+      raise NameError, "undefined local variable or method `#{meth}' for #{self.inspect}"
+    end
+
+    def load_preprocessed_yaml(path)
+      YAML.load(ERB.new(IO.read(path)).result)
+    end
+  end
+end
diff --git a/vendor/configoro/simple.rb b/vendor/configoro/simple.rb
new file mode 100644
index 00000000..2635d132
--- /dev/null
+++ b/vendor/configoro/simple.rb
@@ -0,0 +1,23 @@
+# A stripped-down version of Configoro that works without any gems.
+
+require 'erb'
+require 'yaml'
+
+load File.join(File.dirname(__FILE__), 'base.rb')
+
+# @private
+class Configoro::HashWithIndifferentAccess < ::Hash
+  def deep_merge(other_hash)
+    dup.deep_merge!(other_hash)
+  end
+
+  def deep_merge!(other_hash)
+    other_hash.each_pair do |k, v|
+      tv      = self[k]
+      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+    end
+    self
+  end
+end
+
+load File.join(File.dirname(__FILE__), 'hash.rb')