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
Make magit-save-buffers on magit-status use the directory we are
opening, not the default directory of the buffer we are visiting when
called.
Correct documentation for creating branch

It is b c instead of b n
Update copyright in magit.texi
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.
Fix typos in CONTRIBUTING.md
Uses the usual completion mechanism of magit for gitignore.
Cleans up the ignore code containing redundant code and doc.
Removes some commented code.
Adds a dependency.
Merge pull request #478 into maint