Set default port for SMTP to be 2013
Support bundled gpg
Merge remote-tracking branch 'chiiph/bug/set_gpg_path' into develop