* set a reasonable hostname for puppet to use for each host, and always have mail from masquerade as buttonweavers.com
Merge pull request #573 from cgolubi1/557_confirmation_spam

mail From domain should always masquerade as buttonweavers.com
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 520_ui_fixes