don't track .DS_Store files
add scratch variables and move .highlight to a separate module file