load mirror even if not GELI; only make loader.keys if GELI
add geli swap flags in zfsinstall
nevermind about geli_swap_flags, we already had it above.
let's use swap mirror even when not using GELI
clean up useless bootcode duplication
Merge pull request #10 from johnko/geli

pull geli into bignkpt
Merge branch 'geli' into getpkgs

* geli:
  clean up useless bootcode duplication
  let's use swap mirror even when not using GELI
  nevermind about geli_swap_flags, we already had it above.
  add geli swap flags in zfsinstall
  load mirror even if not GELI; only make loader.keys if GELI

Conflicts:
	tools/zfsinstall
default MFSROOT_MAXSIZE back to 64m
maybe you want to define your own SCRIPTS, BOOTMODULES, MFSMODULES
Merge branch 'geli' into BIGNKPT

* geli:
  maybe you want to define your own SCRIPTS, BOOTMODULES, MFSMODULES

Conflicts:
	Makefile
Merge branch 'BIGNKPT' into getpkgs

* BIGNKPT:
  maybe you want to define your own SCRIPTS, BOOTMODULES, MFSMODULES
  default MFSROOT_MAXSIZE back to 64m

Conflicts:
	Makefile
Merge branch 'getpkgs' into gpgsign

* getpkgs:
  maybe you want to define your own SCRIPTS, BOOTMODULES, MFSMODULES
  default MFSROOT_MAXSIZE back to 64m
  clean up useless bootcode duplication
  let's use swap mirror even when not using GELI
  nevermind about geli_swap_flags, we already had it above.
  add geli swap flags in zfsinstall
  load mirror even if not GELI; only make loader.keys if GELI

Conflicts:
	Makefile