indentation fixes
partial backporting of mcurl changes

Merge branch 'master' into warrick

Conflicts:
	MementoParser.pm
	MementoThread.pm
	mcurl