Tidying up of scripts
Merge branch 'stable' of github.com:joshuaspence/GunWatcher into stable