laptop before merge
Fixed merge conflicts
Merge remote-tracking branch 'origin/NKI' into Laptop
Brought back battery widget
Merged NKI
Added YouCompleteMe
Added YouCompleteMe
Updated awesome rc to account for Skype
Merge branch 'Laptop' of github.com:slagtermaarten/dotfiles into Laptop
Added vi keybindings in inputrc