Added some stuff to .hgignore.  "conflicted copy" is for Dropbox.
Added some stuff to .hgignore.  "conflicted copy" is for Dropbox.

--HG--
branch : development

programmerby/diddy-mirror,programmerby/diddy-mirror,programmerby/diddy-mirror,programmerby/diddy-mirror