Match continuous strings instead of subsequences

You can list several space separated words and each needs to be included in
filename in order for it to be considered a match. It's a more sane approach
than the previous messy one.
Merge branch 'my-rpi' into laptop