tabs are now 2 spaces.  added the 'dash' snippet
resolved conflicts