fix deploy stuff, sort do regions
add mailer and database host config
Merge remote-tracking branch 'upstream/master'