added some aliases and tweaks
do not set PS1
merge origin