Merge pull request #1 from github/master

Updating fork
Returned lost config file

OpenCart has engine file system/library/config.php that must be in version control.
Revert "Packages folder is ignored correctly".
Without the asterisk at the end of the directory's path, an exception for
a file within this directory does not work.
(ex. !packages/repositories.config)

This reverts commit 0fb0fbefa5fcd62ea5b6fe0f433588df270dcd71.
Merge pull request #1032 from ohnit/VisualStudioRevertPackage

Revert "Packages folder is ignored correctly".
Merge pull request #1031 from teslitsky/master

Tighten OpenCart.gitignore config rule
Ignore more osx/afp clutter
Merge pull request #1033 from carpii/osx_tweak

Ignore more osx/afp clutter
Merge remote-tracking branch 'upstream/master'