Disable quit shortcut in awesome and modify i3lock options
Merge branch 'master' of git://github.com/leonhandreke/dotfiles
[vim] Add vim-protobuf and local-vimrc plugins