Fix bug with --short option in missing in certain versions of git
Mergine bugfix with incoming

Merge branch 'master' of https://github.com/spaceconcordia/space-script
Merge branch 'master' of https://github.com/spaceconcordia/space-script
Merge short fix

Merge branch 'master' of https://github.com/spaceconcordia/space-script
MANAGE_CS1.sh: Patched git --short bug, fix warning in at-runner test code