Upgrade to 2.3.1 from official upstream.

Overrides thomas-mcdonald/bootstrap-sass#307, thomas-mcdonald/bootstrap-sass#306
Merge pull request #311 from trisweb/trisweb_2.3.1

Upgrade to 2.3.1 from official upstream.
instruct people to install after adding to Gemfile
add instructions for Rails 4 asset pipeline change
Merge pull request #317 from PatrickMa/master

#316 - Found a temporary solution, adding it to readme.
Move Rails 4 section after Rails section

To avoid confusion.
Reorganize loader for compass support

::Sprockets is the wrong check, since we reference the ::Rails constant directly in the loaded file. This was outright failing when used with an empty compass-sprockets-sass install (without Rails)
Provide image_path that works with Sprockets

Prior to this, functions in sprockets-sass conflicted with ours and caused an infinite loop and StackError. This fixes thomas-mcdonald/bootstrap-sass#257

Note that Sprockets' asset_path requires configuration if it's not already configured by your framework. For example, in a simple Rack app, add the following to your config.ru:

environment.context_class.class_eval do
  def asset_path(path, options = {})
    "/assets/#{path}"
  end
end
Merge pull request #318 from trisweb/tristan_compass_fixes

Fixes for bootstrap-sass used without Rails
bring Changelog up to date
rephrase SCSS file section
merging