merge functions.sh back into aliases.sh