Merge branch 'master' of github.com:jeremyfelt/varying-vagrant-vagrants into develop
Change 'guy' to 'user' in sql sample

This is a little bit splitting hairs, but it seems inappropriate to gender a db user.
Stop the apt-get update flag for 0.3

The check to see if apt-get update had run in the past is a good idea, but fails in practice if you destroy the vagrant box and then run vagrant up again from time to time due to the package source files expiring.

We'll solve this in a different way in the future, but for now it's too shaky to include.
Updated README for 0.3
Merge pull request #27 from jeremyfelt/develop

Merging v0.3 from develop branch
Updated README version to 0.4-working
Merge branch 'master' of github.com:jeremyfelt/varying-vagrant-vagrants into develop
Replace PEAR with Ubuntu packages and composer
Better name
Symlink ack to ack-grep
Added .vimrc file to customize vim.  Also changed provision.sh to link to the vimrc file just like we already do for .bashrc file. The items in the .vimrc file currently make the save file command :wq case insensitive and also will do sudo automatically when saving a file as non-root where sudo is needed
commiting the provision.sh file with the .vimrc changes
Add `IF NOT EXISTS` to database creation in test SQL script

Our example SQL should follow the same guidelines as the other provided SQL and check for database existence before trying to create a new one.

Closes #28, thanks @tddewey
Add a WordPress trunk installation to the default setup

Use SVN to checkout the latest trunk in provisioning. On the first install we then use wp-cli to complete the setup. On repeat provisionings, trunk is updated with svn pull.
Modify documentation to reference new trunk installation of WordPress
Updated documentation for the local WordPress nginx configuration
Move config from local.wordpress.dev.conf into default.conf

default.conf is a better place for the default nginx site configurations included with this setup. This moves both WordPress configs from local.wordpress.dev.conf into default.conf and then deletes the local.wordpress.dev.conf file
Additional documentation for default nginx servers config
Merge branch 'develop' into ack
Merge branch 'develop' into composer