Merge branch 'stable' of github.com:Compass/compass-rails into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Fix reference to 'app/stylesheets' in upgrade instructions
Merge pull request #15 from gjastrab/readme-fix

Fix reference to 'app/stylesheets' in upgrade instructions
Update docs to show when sass-rails is needed.

In rails 3.1 or greater, the sass-rails gem is required.

Closes GH-8.
Clarify upgrqde docs. Closes GH-9
Add a caveat for rails 3.1 mentioning that they should not run 3.1.0. Closes GH-3
Remove unecessary method.
Proper rails configuration.
Fix writing a digested sprite during precompilation and issues surrounding using a generated images directory that is a subdirectory of the images directory.
Version bump
Make sure generated sprites get into the asset manifest.
Fix and cleanup asset precompile for sprites in rails 3.1 and 3.2

Conflicts:

	lib/compass-rails/railties/3_1.rb
Only set those compass configuration options that have been explicitly set by the user.

Closes GH-21.
Version bump
Depend on compass 0.12 full release.
Handle the sass_options set in the compass config too
Only if there are sass_options
Version bump