Merge branch 'master' of github.com:gavincsch/email_signatures
change addresses