making vagrant up work
cleanup outcommented code
Merge pull request #135 from cornelius-keller/master

make vagrant up work on fresh cloned repository
Further linting and deployment automation
Merge pull request #137 from matthewrees/vagrantfile

Further linting and deployment automation
Merge pull request #1 from ceph/master

Rebase from upstream