Fixed issues with diffs not being deleted
Merge branch 'master' of github.com:danrspencer/node-huxley

Conflicts:
	source/imageOperations.js