changed .vimrc
Merge branch 'master' of https://github.com/non-drunkenness/dotfiles
changed .emacs.d/init.el