clean up and
and fix Issue 891
http://code.google.com/p/wkhtmltopdf/issues/detail?id=891

Signed-off-by: pussbb <pussbb@gmail.com>

Conflicts:
	src/lib/loadsettings.cc
	src/lib/loadsettings.hh
	src/lib/multipageloader.cc