Add snipmate.vim to setup-vim-bundles.
Update paths.sh with azkaban.
Resolve merge conflicts.