Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Customize the timesync threshold.

Set the timesync threshold to 10 seconds, instead of the default 20 minutes. If the clock gets more than 15 minutes out of sync (due to your laptop going to sleep for instance, then some 3rd party services will reject requests.
Sorry, had tabs.
Merge pull request #115 from dhrrgn/patch-1

Customize the timesync threshold.
Merge branch 'master' of github.com:fideloper/Vaprobash into develop
Merge branch 'develop'
added vmware fusion base64 box for fusion  users
memory size changing for vmware fusion
Merge branch 'develop'
fixed typo
Merge branch 'develop'
Fairly significant rework of the Apache and nginx scripts. They now pull in vhost creation scripts from the repo and use them directly.
Moved the Apache vhost creation script to repo
Increased configurability of both server setups, allowing server name, document root and aliases to be set in the Vagrantfile.
Also updated the vhost creation scripts to have slightly better error handling
Forgot to include the new Apache vhost script
Left in some local testing file paths
Moved git details export to top of base items
Removed default alias, so default will now be “”
Merge commit '35582129dfffc894adbb4d69477a5f7fcf1a4f5f' into feature-server-config

* commit '35582129dfffc894adbb4d69477a5f7fcf1a4f5f':
  fixed typo
  memory size changing for vmware fusion
  added vmware fusion base64 box for fusion  users
  Sorry, had tabs.
  Customize the timesync threshold.