minor formatting/linting cleanup
add $use_monkeysphere variable (default set to false) to enable non-monkeysphere deployments
migrate to the new define usage
clear line
Revert "clear line"

This reverts commit ce1b40c24305aa377fc7ae73cdf8d6f8351e7aef.
really fix line
add a hack to override the right subnet from the %default connection if
necessary
fix syntax error
improve optional monkeysphere support by enabling the cert generation without monkeysphere
Merge branch 'master' into leap

Conflicts:
	manifests/base.pp
Merge branch 'master' of ssh://code.leap.se/puppet_strongswan into leap