Merge branch 'master' into mac
thats new
Merge branch 'mac' of github.com:florence/.home-configs into mac
some special shit for tor