Better detect nop from git status output.
Merge branch 'master' of github.com:substance/sublime

Conflicts:
	git_status.py