Merge branch 'master' of github.com:dopefishh/dotfiles

diff --combined email/.config/msmtp/config
index 1bd1a72,ebde36d..835767d
--- 1/email/.config/msmtp/config
--- 2/email/.config/msmtp/config
+++ b/email/.config/msmtp/config
@@@ -6,18 -6,16 +6,18 @@@ tls o
  tls_fingerprint 04:89:EE:5E:B3:16:43:D7:48:4C:A3:4B:1A:16:68:3F:01:61:A4:E7:6A:4D:54:28:5A:E1:AD:88:62:65:3A:CD
  user mart@martlubbers.net
  passwordeval pass mail/mart@martlubbers.net
- proxy_host localhost
- proxy_port 8008
+ #proxy_host localhost
+ #proxy_port 8008
  from mart@martlubbers.net
  
  account ru
 -host smtp-auth.ru.nl
 +host smtp.science.ru.nl
  port 587
  auth on
  tls on
 -tls_fingerprint 51:BF:85:89:55:26:F6:73:4D:77:C7:0E:FA:B1:8E:A0:8C:64:BB:8D:21:B9:11:D6:3B:E1:AA:44:8C:DF:93:E0
 -user s4109503
 -passwordeval pass mail/mart.lubbers@student.ru.nl
 -from mart.lubbers@student.ru.nl
 +tls_fingerprint 1F:1D:F5:62:FC:9B:D4:BE:77:30:B1:F4:DB:24:49:F8:21:DD:6F:FC:08:1E:4A:78:0B:AC:C4:B4:FA:8E:A4:10
 +user mlubbers
 +passwordeval pass science.ru.nl/mlubbers
 +from m.lubbers@cs.ru.nl
 +proxy_host localhost
 +proxy_port 8008