markdown and handlebars syntax
get rid of swp files and trailing whitespace
 merge