added tmux conf
small changes to aliases
new machine