Add vim-puppet and track pushed/put branches