add colorcolumn mapping and remove memo files' swap files

and fix s:test_bundle()