Add merge conflict seperator faces in diff view.
Allowing to select the remote and the branch pulling from.

This is a first stab at fixing issue #435.
Fixed a few typos.
Pass through git's log colorization using ansi-color-apply to translate into text properties
Add ERT as git submodule
Add mocker.el as git submodule
Add tests/run-test.el
Use tests/run-test.el from Makefile
Add .travis.yml
Removed an unused `format`.
Placed the options in the right place for `pull`.

Copying the code from `magit-push` was not possible because `magit-pull` is less flexible with its options.
For `magit-push` the options can be passed after the `repository` and the `refspec`.
However, at least for `--rebase`, `magit-pull` does not accept this format.
Removes some commented code.
Adds a dependency.
Updated the documentation for the branch manager.
Rewrote the branching section of the documentation.

Merged the branching section with the branch manager and added information about managing remotes.
Adds missing double spaces after period ending sentence.
Merge pull request #484 from dudebout/manual

Updated the manual
Uses the usual completion mechanism of magit for gitignore.
Cleans up the ignore code containing redundant code and doc.
Use a default value when asking for a file to ignore