Add bundler and rails support to vim
Merge from remote branch