Bump PHPUnit to 4.0
Fix typo
Merge pull request #212 from driesvints/patch-1

Bump PHPUnit to 4.0
Merge pull request #211 from jeremyworboys/patch-1

Fix typo
Merge branch 'master' into develop
Merge branch 'develop'
comments to vagrantfile
so some items are more explicit - local scripts and hostname
fixed issue #214: Composer HOME_DIRECTORY not set correctly
Merge branch 'develop'
more comments around IP address
Merge branch 'develop'
restricted available IP ranges a bit to account for subnet/mask IPs
Merge branch 'develop'
added heroku toolbelt install. not a vaprobash script
Merge branch 'develop'
added heroku and moved supervisord
Merge branch 'develop'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Vagrantfile