removed jack-mode
fixed merge conflicts
powerline had new commits