Minor formatting changes before build.  Also added irinix auth factor.  If you're not me, you're not no-one.