Add '--default-encoding' alias to '-E' command-line option
Ensure that keyword arguments passed by map have hyphens normalized.

Closes #989
Properly escape file paths passed to Dir#[] in the FS importer.

Closes #287
Fix sass-convert with empty CSS rules.

Closes #1022
Make sass work when symlinked by encap.
Merge commit '69c7b96'

Conflicts:
	lib/sass/exec.rb
Fix CSS url("...") imports with media queries.

Closes #1042
Merge pull request #790 from pwnall/symlinks

Make sass work when symlinked by encap.
Fix a syntax error.
Merge branch 'stable'

Conflicts:
	lib/sass/importers/filesystem.rb
	lib/sass/script/funcall.rb
Merge remote-tracking branch 'origin/stable' into stable
Merge branch 'stable'
Merge remote-tracking branch 'origin/master'