Applies columns patch by Evan Gates
Added the patch directory to ignore