fix lib/scripts git diff issues
Merge branch 'master' of https://github.com/jamessonbros/almarknives