Added tmux.conf and some other stuff
Merged some stuff