Add vim-mocha and replace rspec-vim with mocha
Update submodules