Merge branch 'master' into php5

* master:
  Only apply git ignores relative to repository root.
  Remove all ignores that belong to users global .gitignore file.
  The composer.lock file belongs to the repository. Do not ignore.

.gitignore

@@ -1,51 +1,2 @@
-# Numerous always-ignore extensions
-*.diff
-*.err
-*.orig
-*.log
-*.rej
-*.swo
-*.swp
-*.vi
-*~
-*.sass-cache
-
-# OS or Editor folders
-.DS_Store
-._*
-Thumbs.db
-.cache
-.project
-.settings
-.tmproj
-nbproject
-*.sublime-project
-*.sublime-workspace
-
-# Dreamweaver added files
-_notes
-dwsync.xml
-
-# Komodo
-*.komodoproject
-.komodotools
-
-# Espresso
-*.esproj
-*.espressostorage
-
-# Rubinius
-*.rbc
-
-# Folders to ignore
-.hg
-.svn
-.CVS
-intermediate
-publish
-.idea
-
-# local files
-vendor
-composer.phar
-composer.lock
+/vendor
+/composer.phar