Added whitespace handling and more git shortcuts
Merge https://github.com/darrina/scripts into develop