Exit with code 1 in case of error for `docker build`
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"

Fixes #3372
Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion"

This is split off from #2970.
Merge pull request #3379 from tianon/organize-contrib-syntax

Reorganize the syntax highlighting files in contrib under a common directory
Merge pull request #3355 from creack/fix_build_exit

Exit with code 1 in case of error for `docker build`
support for container names in bash completion
Merge pull request #3398 from thomasleveil/bash_completion_names

support for container names in bash completion
Mac OSX command for pip was incorrect
Merge pull request #3374 from tianon/fpm-license-vendor

Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
Merge pull request #3419 from newzealandpaul/master

Mac OS X command in docs for pip fixed