.vimrc
Merge branch 'master' of s01en04:~/Dropbox/config
add some changes
delete simple pairs
Merge branch 'master' of s01en04:~/Dropbox/config