Merge pull request #1 from trinitronx/trinitronx/fix-apt-key-error

Attempt to fix apt repo key error
Merge pull request #2 from trinitronx/add-vagrantfile

Add Vagrantfile
Merge branch 'master' into develop