PHPCS/WPCS: git pull --no-edit if on master branch
Merge pull request #330 from x-team/git-pull-no-edit-no-rebase

PHPCS/WPCS: git pull --no-edit if on master branch
Use Trusty 64 box and remove unneeded PPAs
Specifically install npm
Symlink nodejs as node because Ubuntu sucks sometimes
Check if an SVN upgrade is needed, and if so upgrade all svn repos 5 levels deep from /srv/www
Additional CHANGELOG notes around database (un)mapping
Text changes for DB mapping
Merge pull request #322 from Varying-Vagrant-Vagrants/database

[PR] Only mount shared DB drive if already mounting
Merge pull request #335 from aaroncampbell/trusty64

[PR] Use Trusty 64 box and remove unneeded PPAs
Update README to match latest master changes
Remove hacky mysql start script on boot

We aren't handling persistent DB connections anymore, so we
should have an easier time at managing this.
Add CHANGELOG note about Ubuntu 14.04 change
Add aaroncampbell to contributors list, thanks!
Track nginx stable for trusty, currently 1.6.x
Merge pull request #342 from Varying-Vagrant-Vagrants/merge-cleanups

[PR] Various cleanups and text changes from latest merges
Install XDebug via PECL rather than apt

The version of XDebug provided by the Ubuntu repository was 2.2.3,
which (per #317) appears to cause some issues when attempting to
load our default sites on some machines.

Using PECL directly allows us to install the latest stable version,
which is 2.2.5 at this time.
Merge pull request #343 from Varying-Vagrant-Vagrants/bug/xdebug

[PR] Install XDebug via PECL rather than apt
Remove uses of "Feel free" in contributing

Because you should already feel free. :)
Update language around feature branches

Closes #323 for now