Now vim install upgrades setuptools of python
Merge branch 'master' of github.com:magnet-cl/magnetizer

Conflicts:
	fabfile/vim.py