Split up provision script into parts, changed Vagrantfile to reflect
Changed order of the split; provision now checks for env variables
Changed Vagrantfile to use shell provsion, updated scripts accordingly
Merge branch 'dev'