Removing venv
Removing venv
added cassandra as a serivce to travis
merged cassandra service
merged conflicts in vagrant up.sh
moved around shit