fix conflict
add tmuxinator setting
tiny
update submodules
add coffee-mode