remove vim
Merge branch 'master' of github.com:dock0/arch

Conflicts:
	Dockerfile