Updated conky for new laptop
Moved i3 key chords back to Shift

I should make a variable for that key...
Re-enabled conky in i3
Created laptop-specific i3 bar conkyrc