Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Add several variables
Change default password
Update Vagrantfile

Added explicit memory modifier so that it's easier to edit. Also upped it a little from the default 384MB (which is a weird number anyway ;))
Merge pull request #33 from mrdevries/develop

Update Vagrantfile, added memory modifier
comments in vagrantfile, along with default ram setting and the ability to allocate more
Merge pull request #27 from modbase/master

Prevent hardcoded passwords and IPs
resolved conflict for merge with #27
updated nginx conf comment
Got IP addresses out of quotes for vhosts for apache and nginx
Merge branch 'feature/vars' into develop
My GitHub Settings
Use Node Version Manager