Added vagrant stuff and added labels
Merge branch 'master' of github.com:jakobhans/dot-files
Setup some stuff, updated vim plugins