merged or something
added keybind for kill-server/window
added git alias for pretty log