Rename the 'continuent_oracle' to be 'oracle'
Merge branch 'master' of https://github.com/continuent/continuent-vagrant

Conflicts:
	.gitmodules