Remove node_modules and .sass-cache from Hg ignores.
Use the most primitive merge tool with Hg.
Merge remote-tracking branch 'origin/master'