Ignore vim swp files
add text format to skin
Merge branch 'skin_text_format' into development