Fix #540 & #566: Guardfile re-evaluation

This fixes #540.