Bug 969215 - Sync package.json changes, dive -> diveSync
Merge pull request #73 from KevinGrandon/bug_969215_sync_package_json

Bug 969215 - Sync package.json changes, dive -> diveSync
Bug 1098149 - Upgrade jshint to 2.5.10 r=kgrandon
Merge pull request #74 from KevinGrandon/bug_1098149_upgrade_jshint

Bug 1098149 - Upgrade jshint to 2.5.10
evert "Bug 1098149 - Upgrade jshint to 2.5.10 r=kgrandon"

This reverts commit f98ce4d825c609de4bfcc3e3b530b95a9b9fa3f1.
Bug 1097591 - marionette-apps r=lightsofapollo