Dev Adjusted ignored files

.gitignore

@@ -3,6 +3,8 @@
 /upload/surveys/*
 /styles/gringegreen/images/Thumbs.db
 /upload/templates/*
+/upload/labels/*
+!/upload/labels/readme.txt
 /tmp/runtime/HTML
 /application/controllers/admin/updater.php
 /tmp/*.html
@@ -14,8 +16,8 @@
 /upload/.htaccess
 /nbproject
 /tmp/assets/*
-/tmp/assets/!.gitignore
-/tmp/assets/!index.html
+!/tmp/assets/.gitignore
+!/tmp/assets/index.html
 /tmp/runtime/cache/*
 /framework
 .svn