arch - bash and vim user configuration
Merge branch 'master' of github.com:slithery/vps

Conflicts:
	root/.config/bashrc