Merged .aliases.bash with master