Update bash functions and aliases
Merge branch 'master' into macbook_air