More aliases and functions
Fix quoting in shell script
Merge branch 'master' into work-env