Update vimrc for improved YCM and python
Use dotfiles to manage install and syncing of dotfiles
Install wine, virtualbox, vagrant
Merge branch 'master' of github.com:davidjb/dotfiles

Conflicts:
	bootstrap.sh