Tmux conf
Fixin conflicts
Added capistrano completion