Updated .gitignore settings

The directories need a wildcard to ignore the files in them.
Post-merge from master

Just merged the updates from the master into the code.