Merge branch 'master' of github.com:laroque/config
Update to conky for higgsino