Updated for tmux support and gitmodules bugufix