updates to basic KLIPS test
quiet down some debugging
make sure modules appear to exist
whitespace changes only
Merge remote-tracking branch 'today/master' into today
whitespace change
Merge remote-tracking branch 'cve-2013-2053/today' into devel

Conflicts:
	lib/libopenswan/kernel_alg.c
	programs/pluto/ikev1_aggr.c
	programs/pluto/ikev1_main.c
	programs/pluto/ikev2.c
	programs/pluto/plutoalg.c
	programs/pluto/spdb_print.c
	programs/pluto/state.c
	testing/klips/east-icmp-01/spi1-console.txt