Ignore swp files
Support bulk variable adding and 'None' variable values
Support whitespace in default values by using _ in template