vim: change indentation 4 -> 2 spaces

Fix gh-29
Add package links to README
vim: disable line wrapping

Prevents the vim UI from getting messed up by long lines, e.g., base64
strings.

Fix gh-30
Merge branch 'master' of https://github.com/necolas/dotfiles

Conflicts:
	vim/vimrc