i3 keybinding; added conky config; cleaned xinitrc
Merge branch 'master' of https://github.com/makp/x-configs