Added indent autodetection
Fixed merge conflict
Added tmux config back