Merge pull request #200 from ngoldman/master

Fix image URLs, move temp files to ignored tmp directory