Taglist: Replaced with Tagbar. Rails.vim removed. Autocompletion: Changed to 4 chars. README: Updated.
Merge conflict solved.