Add vim-puppet and tabular. Remove powerline.