Setup now works in vagrant and osx both. Added makefile with simple
targets to help with running common tasks (both locally and in travis).