Add .dir-locals.el to set up Emacs c-mode appropriately (thanks, monkeyiq for original settings)
Merge pull request #1209 from rrthomas/master

Add .dir-locals.el to set up Emacs c-mode appropriately (thanks, monkeyiq)
Replace Windows icon with better copy.
Merge remote branch 'upstream/master'