Install composer deps
Merge remote-tracking branch 'origin/master'

* origin/master:
  vcsh upgrade
  vcsh upgrade
  Install Composer using prebuilt Composer
  Fix path function calls
  Import Composer configuration from dotfiles
  Add Composer environment variables

Conflicts:
	.config/mr/config.d/php