Merge pull request #75 from volaya/conflicts_improvements

Conflicts improvements
Added additional plumbing commands (ls-tree, cat, rev-list, merge-base, diff-tree and show-ref).

Changed help command to show just porcelain commands.

Porcelain command for listing a path is now called "ls".

Added documentation for plumbing commands and removed it from manual