Git merge

This is an update of the git branch with the latest master.

Everything seems in order, except the repo_browser view doesn't work for git. It does work for svn, though.
There were some merge conflicts, so it's possible I just happened to resolve them incorrectly.

This should be a simple fix, though.

@SoftwareDev @mark-kazakevich @toriverly