Use a Makefile instead of fabric.

In my opinion this is more elegant, and more readable.
Merge pull request #2 from robru/makefile

Merge support for current ubuntu releases
Do `vagrant box add` as well, for completeness.
De-duplicate Vagrantfile.