Correct embarassing mix of single and double quotes
Merge remote-tracking branch 'origin/master' into add-specs

* origin/master:
  Correct embarassing mix of single and double quotes

Conflicts:
	app/models/article.rb
Mark failing routing spec as pending
Explicitly use old rspec mock syntax to fix dep warning

Using `any_instance` from rspec-mocks' old `:should` syntax without
explicitly enabling the syntax is deprecated. Use the new `:expect`
syntax or explicitly enable `:should` instead.