Fixed repeat saving manifest in compile
Fixing a typo in comment
Merge pull request #474 from adomokos/fix_typo

Fixing a typo in comment
Fixed two more sets of tests not running under minitest

Same kind of problem as was fixed in
e840d7fedd180929d089f17d6d6e322e672780f0. This brings the total number
of assertions from 759 back to 1021.
Merge pull request #476 from jslag/master

Fixed two more sets of tests not running under minitest
replace `JSON` `dump`/`load` with `parse`/`generate`

`dump` and `load` are for built around Marshaling ruby objects generally.
They correspond with those methods on Ruby's `Marshal` class. Theses
methods actually call `parse`/`generate` in code but pass some defaults
along with it. Sprockets only needs to parse JSON documents not Ruby
objects.

For `JSON.load`, we want to disable `create_additions`.
`create_additions` could be considered a security hazard if set to true.
`create_additions` allows the instantiation of any class that's
marshaled as json
Merge pull request #479 from hone/master

replace `JSON` `dump`/`load` with `parse`/`generate`
Fix (cosmetic) typo in Sprockets::Manifest code comment
Merge pull request #485 from wincent/typo-fix

Fix (cosmetic) typo in Sprockets::Manifest code comment
Merge remote-tracking branch 'origin/master' into fixed-repeat-saving-manifest
Merge pull request #424 from hotchpotch/fixed-repeat-saving-manifest

Fast assets:precompile
Work around sourcemap to_json issue
Get oughta here DS_Store
Adjust new source map offset
Merge branch 'master' into source-maps
Concat bundle asset mappings with inject
Map object, not mappings