Git custom merge for rails schema
Comments for history
Clean up vimrc, add folding