change lock keybinding to ctl-alt-e
Merge branch 'master' of github.com:brandonsilver/dotfiles

changed things on two computers between pulls. oops i guess.