Review https://github.com/tataronrails/abulafia/pull/15
Merge pull request #22 from tataronrails/vi-pull-request-618

Review old https://github.com/tataronrails/abulafia/pull/15