more rails features for vim
merging