Merge branch 'stable'
Merge branch 'stable'
Merge branch 'stable'

Conflicts:
	VERSION
Implement sourcemap generation
Remove unnecessary code, add files that were left behind
Fix line counting in the sourcemap output
Follow review, remove unnecessary :id field and an unused method
Merge branch 'stable'
Consider files with the same name to be an error.

See #499
Merge branch 'stable'
Merge branch 'master' into sourcemap

Conflicts:
	lib/sass/scss/parser.rb
Changes to the structure and style of the source map patch.
Fix some off-by-one bugs in column calculations.
JSON dumping tests added, json_value_of return type and whitespace character dumping fixed
Merge pull request #524 from crdev/sourcemap

JSON dumping tests added, return type and special character escaping fixed
Get rid of Sass::Util.char_size.

This was causing as many problems as it fixed, since it didn't address other
byte-indexed methods on 1.8 (e.g. String#[]). Avoiding byte indexing pervasively
would be more effort than it's worth.
Rename SourceMapping to SourceMap.
Use NEWLINE in ToCss#output.
Use "offset" consistently, rather than "column".
Improve the Source* inspect methods.