Reverted NodeGitAPI stuff (who made those changes!!!).  Update LineDiff.
Merge branch 'master' of https://github.com/morrisjosephd/repoMan
Fixed conflicts

Conflicts:
	components/javascripts/lineDiff.js
	spec/lineDiffspec.js