Fixed color column in vim and added scratch.vim
Removed pentadactyl.
Merge branch 'master' of https://github.com/krwenholz/dotfiles