Merge pull request #1 from hedenberg/master

test
vagrantfile
linus
lol nope
Merge pull request #1 from Gegga87/master

Merge pull request #1 from hedenberg/master