support infrastructure branches other than master
add mailserver instructions
more mailserver instructions
more mailserver instructions