Sync devtools
Merge branch 'master' into unite-spec-files
Fix Guardfile
Merge branch 'master' into unite-spec-files
Remove duplicate let statements