Fixed merging issue.
Removing redundant git-status call during diff & refractored staging.js