added additional git and some libreoffice aliases
Merge branch 'master' into laptop