Merge branch 'master' of https://github.com/ikazoy/configfiles
delete kannel.conf
vim color bundle (altercation/vim-colors-solarized)
remove unnecessary part from bashrc
test