Merge branch 'fix-1013'

I made some changes to the original pull request to remove complexity which
I believe was not needed.

Umbraco.gitignore

-# Ignore Umbraco folders (Generated folders created by Umbraco)
-ClientDependency/
-TEMP/
-Logs/
+# Note: VisualStudio gitignore rules may also be relevant
+
+# Ignore unimportant folders generated by Umbraco
+**/App_Data/ClientDependency/
+**/App_Data/ExamineIndexes/
+**/App_Data/Logs/
+**/App_Data/[Pp]review/
+**/App_Data/TEMP/
 Cached/
-ExamineIndexes/
 
 # Ignore Umbraco content cache file
-umbraco.config
+**/App_Data/umbraco.config