gitignore .bash_aliases_custom
Merge branch 'master' into romgm