WP-CLI plugin init
Add README.md for adb-autocompletion plugin.
Improve support for Vagrant VM definitions
Use the library function for ruby prompt

Not everyone uses rvm and the library has already got a function for this.
add git difftool alias (gdt)
add wp-cli plugin readme
Merge pull request #3069 from johnjohndoe/feature/adb-autocompletion

Add README.md for adb-autocompletion plugin.
Revert "Add a CONTRIBUTING file to instruct people on issues and pull requests"
Merge pull request #3076 from robbyrussell/revert-2766-add-contributing-file

Revert "Add a CONTRIBUTING file to instruct people on issues and pull re...
Revert "Add Composer's local binaries to PATH"
Merge pull request #3077 from robbyrussell/revert-3068-patch-1

Revert "Add Composer's local binaries to PATH"
Merge pull request #3070 from stucki/vagrant-vm-list-fix

Improve support for Vagrant VM definitions
Merge pull request #3071 from halilim/patch-4

Use the library function for ruby prompt
Merge pull request #2996 from joshmedeski/master

WP-CLI plugin init
Merge pull request #3073 from ajhenriques/master

add git difftool alias (gdt)
Add CONTRIBUTING.md file general structure
Categories of issues in oh-my-zsh (work-in-progress)
Format categories of issues in oh-my-zsh (still WIP)

Conflicts:
	CONTRIBUTING.md