seems to be installing base joomla now
Merge branch 'master' of github.com:rjgallac/joomla

Conflicts:
	.vagrant/machines/default/virtualbox/action_provision
	.vagrant/machines/default/virtualbox/action_set_name
	.vagrant/machines/default/virtualbox/id
	Vagrantfile