add Marked as an app to open markdown files with
update settings
hide DS_Store files
update settings
detect slow plugins
new sublime settings
fix merge conflict