"update the bootstrap.sh with mariadb"
streamlined the mariadb install
streamlined the mariadb install
Merge branch 'master' of https://github.com/exuperok/vagrant-shell-provisioned-boxes

Conflicts:
	Vagrantfile