Clean up .vimrc for vim-rspec plugin
Add moonscript test shortcut
Add javascript test shortcut
Update ruby test shortcut
Fix merge conflict