Merge branch 'master' into vagrant-chef

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Before You Start
 
-Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/discourse/discourse)** project **MUST read & sign the [Electronic Discourse Forums Contribution License Agreement](https://docs.google.com/a/discourse.org/spreadsheet/viewform?formkey=dGUwejFfbDhDYXR4bVFMRG1TUENqLWc6MQ)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first.
+Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/discourse/discourse)** project **MUST read & sign the [Electronic Discourse Forums Contribution License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first.
 
 ## Reporting Bugs
 
@@ -20,7 +20,7 @@ Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/d
 
 ## Requesting New Features
 
-1. Do not submit a feature request on GitHub; all feature requests on GitHub will be closed. Instead, visit the Discourse development forums, and search for the "Feature Request" category, which will filter a list of outstanding requests. Review this list for similar feature requests. It's possible somebody has already asked for this feature or provided a pull request that we're still discussing.
+1. Do not submit a feature request on GitHub; all feature requests on GitHub will be closed. Instead, visit the **[Discourse development forums](http://meta.discourse.org/category/feature)**, and search for the "Feature" category, which will filter a list of outstanding requests. Review this list for similar feature requests. It's possible somebody has already asked for this feature or provided a pull request that we're still discussing.
 
 2. Provide a clear and detailed explanation of the feature you want and why it's important to add. The feature must apply to a wide array of users of Discourse; for smaller, more targeted "one-off" features, you might consider writing a plugin for Discourse. You may also want to provide us with some advance documentation on the feature, which will help the community to better understand where it will fit.
 

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'slim'  # required for sidekiq-web
 gem 'redis'
 gem 'redis-rails'
 gem 'hiredis'

Gemfile.lock

@@ -344,7 +344,6 @@ GEM
     temple (0.4.1)
     terminal-notifier-guard (1.5.3)
     terminal-table (1.4.5)
-    test-unit (2.5.4)
     therubyracer (0.11.3)
       libv8 (~> 3.11.8.12)
       ref
@@ -391,7 +390,6 @@ DEPENDENCIES
   guard-jasmine
   guard-rspec
   guard-spork
-  haml
   has_ip_address
   hiredis
   hpricot
@@ -432,9 +430,8 @@ DEPENDENCIES
   simple_handlebars_rails!
   simplecov
   sinatra
-  slim (<= 1.3.0)
+  slim
   terminal-notifier-guard
-  test-unit
   therubyracer
   thin
   turbo-sprockets-rails3

public/500.html

@@ -7,6 +7,6 @@
     <h1>Oops</h1>
     <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
     <p>Detailed information about the error was logged, and an automatic notification. We'll take a look at it.</p>
-    <p>No further action is necessary. Howeever, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the <a href="/categories/meta">meta category</a>.</p>
+    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the <a href="/categories/meta">meta category</a>.</p>
 </body>
 </html>