Moved the bash completion and command-not-found hooks into bashrc.
Added battery to conky status for Kinisi and switched keyboard to US.
Updated vimrc.
Merge branch 'master' of github.com:Scrumplesplunge/dotfiles