Fix git branch name sometimes getting stuck with inotify

If you try to checkout the already current branch in git, git creates
HEAD.lock and renames it to HEAD. This causes the inode of HEAD to
change and so the inotify file watcher stops tracking HEAD.

The fix is to re-create the inotify watch when the file attributes
change. This is a bit of a performance penalty as most of the time the
attribute changes are simple last modified time/size changes, but since
inotify provides no way to know specifically when the inode has changed,
this is the best we can do.
Update dependanceies for Arch packages.
On travis there are differences in CRs for some reason

This commit strips CRs from *.ok files and test output. Test failure used to be 
not recognized due to pipe: `cat -v` always succeeds meaning that `if ! diff 
… | cat -v` always succeeds too.
Merge branch 'fix-functional-tests-diff' into develop
Merge pull request #707 from wsnyders/develop

Update dependanceies for Arch packages.
Merge pull request #667 from kovidgoyal/fix-git-branch-name

Fix git branch name sometimes getting stuck with inotify
Try to workaround problems with last line in travis
Merge pull request #753 from ZyX-I/fix-functional-tests-diff-2

Try to workaround problems with last line in travis
Remove archlinux packages
Merge branch 'remove-packages' into develop
Remove fontpatcher and symbol font

The package has been moved to
https://github.com/Lokaltog/powerline-fontpatcher
Merge branch 'remove-fontpatcher' into develop
Merge branch 'develop' into local-develop