Include a template for Guardfiles
Remove local invocation
Fix regexp in Guardfile
Fix execution and add tidy up (a bit) the code
Merge branch 'fixes'