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.
A lowercase f for the unit caused the weather segment to silently fail. Putting in a capital F works correctly
Add tests
Also check for jobnum
Merge pull request #751 from mrrcollins/rc

A lowercase f for the unit caused the weather segment to silently fail. ...
Merge pull request #708 from ZyX-I/fix-finish_args-typo

Fix finish args typo
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