Moved to Puppet 3.1 as the base auth.conf template

Also, swapped around the more general rule to go below the specific
rules because of what's said up top.