Fixed bug with vagrant user.
Added something to stop Apache, but it's commented out for now until I sort out how Apache is getting on the system
Updated syntax, added a magic value for Vagrant instances instead of trying to "guess"