Adds KnpLabs/symfony2-autocomplete as a submodule in the vendor directory.
Adds Netbeans ".project" folder to git.d/ignore
Resolve merge conflict