ConfHandler#parse and ConfLoadingHandler#parse implementation to satisfy tests
Making tests run again
Fix issues to make git-2.x working

- Changed the regexp to find the current branch to be compatible with
  git-2.0.0. It should be backward compatible with git-1.x
- Fixed option passing from the status menu to the diff method.