Install Node.js
Make what I thought worked before work again
Merge pull request #29 from humanmade/node

NodeJS + Build tools
Use dnsmasq to route `*.dev` requests to the proper IP address
A more concise way of saying this
Merge pull request #1 from humanmade/dnsmasq-1

Automatically handle internal requests to *.dev domains
added timestamp docs
Merge pull request #33 from humanmade/timestamp-docs

added timestamp docs
Make these requirements more explicit, so this doesn't fail on the first provision
Merge pull request #35 from humanmade/fix-wp-provision-35

Config for wordpress-trunk.dev not available after initial `vagrant up`
fix merge conflict