Setup pythonvirtualenv and dotfiles
Merge branch 'master' of https://github.com/chaoranxie/my-boxen

Conflicts:
	modules/people/manifests/chaoranxie.pp