diff --git a/Actionscript.gitignore b/Actionscript.gitignore
index fa65f0b..f112f7f 100644
--- a/Actionscript.gitignore
+++ b/Actionscript.gitignore
@@ -1,11 +1,11 @@
 # Build and Release Folders
 bin/
 bin-debug/
 bin-release/
 
 # Other files and folders
 .settings/
 
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
-# information for Eclipse / Flash Builder.
\ No newline at end of file
+# information for Eclipse / Flash Builder.
diff --git a/Agda.gitignore b/Agda.gitignore
new file mode 100644
index 0000000..171a389
--- /dev/null
+++ b/Agda.gitignore
@@ -0,0 +1 @@
+*.agdai
diff --git a/Android.gitignore b/Android.gitignore
index 87a44e0..927ef51 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -1,30 +1,23 @@
 # built application files
 *.apk
 *.ap_
 
 # files for the dex VM
 *.dex
 
 # Java class files
 *.class
 
 # generated files
 bin/
 gen/
 
+# Ignore gradle files
+.gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Eclipse project files
-.classpath
-.project
-
 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
-
diff --git a/Autotools.gitignore b/Autotools.gitignore
index fc5e847..053ff52 100644
--- a/Autotools.gitignore
+++ b/Autotools.gitignore
@@ -1,13 +1,14 @@
 # http://www.gnu.org/software/automake
 
 Makefile.in
 
 # http://www.gnu.org/software/autoconf
 
 /autom4te.cache
 /aclocal.m4
 /compile
 /configure
 /depcomp
 /install-sh
 /missing
+/stamp-h1
diff --git a/C++.gitignore b/C++.gitignore
index 620d3dc..0def275 100644
--- a/C++.gitignore
+++ b/C++.gitignore
@@ -1,13 +1,21 @@
 # Compiled Object files
 *.slo
 *.lo
 *.o
+*.obj
 
 # Compiled Dynamic libraries
 *.so
 *.dylib
+*.dll
 
 # Compiled Static libraries
 *.lai
 *.la
 *.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
diff --git a/C.gitignore b/C.gitignore
index 0331bbb..6a2f800 100644
--- a/C.gitignore
+++ b/C.gitignore
@@ -1,17 +1,21 @@
 # Object files
 *.o
+*.ko
+*.obj
+*.elf
 
 # Libraries
 *.lib
 *.a
 
 # Shared objects (inc. Windows DLLs)
 *.dll
 *.so
 *.so.*
 *.dylib
 
 # Executables
 *.exe
 *.out
 *.app
+*.hex
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..91543ab
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,34 @@
+# Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
+
+- **Provide a link to the application or project’s homepage**. Unless it’s
+  extremely popular, there’s a chance the maintainers don’t know about or use
+  the language, framework, editor, app, or project your change applies to.
+  
+- **Provide links to documentation** supporting the change you’re making.
+  Current, canonical documentation mentioning the files being ignored is best.
+  If documentation isn’t available to support your change, do the best you can
+  to explain what the files being ignored are for.
+  
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+  take a sentence or two to tell us why your change or addition should happen.
+  It’s especially helpful to articulate why this change applies to *everyone*
+  who works with the applicable technology, rather than just you or your team.
+  
+- **Please consider the scope of your change**. If your change specific to a
+  certain language or framework, then make sure the change is made to the
+  template for that language or framework, rather than to the template for an
+  editor, tool, or operating system.
+
+- **Please only modify *one template* per pull request**. This helps keep pull
+  requests and feedback focused on a specific project or technology.
+
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
+
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.
diff --git a/CakePHP.gitignore b/CakePHP.gitignore
index 61d3446..bd743c4 100644
--- a/CakePHP.gitignore
+++ b/CakePHP.gitignore
@@ -1,7 +1,7 @@
 tmp/*
 [Cc]onfig/core.php
 [Cc]onfig/database.php
 app/tmp/*
 app/[Cc]onfig/core.php
 app/[Cc]onfig/database.php
-!empty
\ No newline at end of file
+!empty
diff --git a/CodeIgniter.gitignore b/CodeIgniter.gitignore
index e84c641..ca0e37e 100644
--- a/CodeIgniter.gitignore
+++ b/CodeIgniter.gitignore
@@ -1,5 +1,6 @@
 */config/development
 */logs/log-*.php
 */logs/!index.html
 */cache/*
 */cache/!index.html
+*/cache/!.htaccess
\ No newline at end of file
diff --git a/Composer.gitignore b/Composer.gitignore
new file mode 100644
index 0000000..aa5997f
--- /dev/null
+++ b/Composer.gitignore
@@ -0,0 +1,6 @@
+composer.phar
+vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/Concrete5.gitignore b/Concrete5.gitignore
index cfe1cab..9aa215a 100644
--- a/Concrete5.gitignore
+++ b/Concrete5.gitignore
@@ -1,3 +1,3 @@
 config/site.php
 files/cache/*
-files/tmp/*
\ No newline at end of file
+files/tmp/*
diff --git a/Coq.gitignore b/Coq.gitignore
index 769bc36..d3083b3 100644
--- a/Coq.gitignore
+++ b/Coq.gitignore
@@ -1,4 +1,3 @@
 *.vo
 *.glob
 *.v.d
-
diff --git a/Dart.gitignore b/Dart.gitignore
index 46f5762..db4229d 100644
--- a/Dart.gitignore
+++ b/Dart.gitignore
@@ -1,4 +1,16 @@
-.DS_Store
-packages
+// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+packages/
 .project
-pubspec.lock
+.buildlog
+*.js_
+*.js.deps
+*.js.map
+
+// Include when developing application packages
+pubspec.lock 
+
+// Avoid committing generated JavaScript files
+*.dart.js
+
+// Check for any other incovenient files generated by OS 
+// and other tools such as Eclipse, IntelliJ, etc.
diff --git a/Delphi.gitignore b/Delphi.gitignore
index 38b6bd0..7f331f1 100644
--- a/Delphi.gitignore
+++ b/Delphi.gitignore
@@ -1,10 +1,10 @@
 *.dcu
-*.~*~
+*.~*
 *.local
 *.identcache
 __history
 *.drc
 *.map
 *.exe
 *.dll
-bin/*
\ No newline at end of file
+bin/*
diff --git a/Django.gitignore b/Django.gitignore
deleted file mode 100644
index d9437c3..0000000
--- a/Django.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.log
-*.pot
-*.pyc
-local_settings.py
diff --git a/Drupal.gitignore b/Drupal.gitignore
index 73677d2..a14c765 100644
--- a/Drupal.gitignore
+++ b/Drupal.gitignore
@@ -1,37 +1,37 @@
 # Ignore configuration files that may contain sensitive information.
 sites/*/*settings*.php
 
 # Ignore paths that contain generated content.
 cache/
 files/
 sites/*/files
 sites/*/private
 
 # Ignore default text files
-.htaccess
 robots.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt
 /INSTALL*.txt
 /LICENSE.txt
 /MAINTAINERS.txt
 /UPGRADE.txt
 /README.txt
 sites/all/README.txt
 sites/all/modules/README.txt
 sites/all/themes/README.txt
 
 # Ignore everything but the "sites" folder ( for non core developer )
+.htaccess
 web.config
 authorize.php
 cron.php
 index.php
 install.php
 update.php
 xmlrpc.php
 /includes
 /misc
 /modules
 /profiles
 /scripts
-/themes
\ No newline at end of file
+/themes
diff --git a/EPiServer.gitignore b/EPiServer.gitignore
new file mode 100644
index 0000000..ca7a786
--- /dev/null
+++ b/EPiServer.gitignore
@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config
\ No newline at end of file
diff --git a/ExpressionEngine.gitignore b/ExpressionEngine.gitignore
index c56e7ab..314e4df 100644
--- a/ExpressionEngine.gitignore
+++ b/ExpressionEngine.gitignore
@@ -1,15 +1,19 @@
 .DS_Store
 
 # Images
 images/avatars/
 images/captchas/
 images/smileys/
 images/member_photos/
 images/signature_attachments/
 images/pm_attachments/
 
+# For security do not publish the following files
+system/expressionengine/config/database.php
+system/expressionengine/config/config.php
+
 # Caches
 sized/
 thumbs/
 _thumbs/
-*/expressionengine/cache/*
\ No newline at end of file
+*/expressionengine/cache/*
diff --git a/Fancy.gitignore b/Fancy.gitignore
new file mode 100644
index 0000000..6b34507
--- /dev/null
+++ b/Fancy.gitignore
@@ -0,0 +1,2 @@
+*.rbc
+*.fyc
\ No newline at end of file
diff --git a/Finale.gitignore b/Finale.gitignore
index c8ac293..7ef08e0 100644
--- a/Finale.gitignore
+++ b/Finale.gitignore
@@ -1,14 +1,13 @@
 *.bak
 *.db
 *.avi
 *.pdf
 *.ps
 *.mid
 *.midi
 *.mp3
 *.aif
 *.wav
 # Some versions of Finale have a bug and randomly save extra copies of
 # the music source as "<Filename> copy.mus"
 *copy.mus
-
diff --git a/ForceDotCom.gitignore b/ForceDotCom.gitignore
index ee95ec3..3933cd4 100644
--- a/ForceDotCom.gitignore
+++ b/ForceDotCom.gitignore
@@ -1,4 +1,4 @@
 .project
 .settings
 salesforce.schema
-Referenced Packages
\ No newline at end of file
+Referenced Packages
diff --git a/GWT.gitignore b/GWT.gitignore
index 63e3e9c..c558713 100644
--- a/GWT.gitignore
+++ b/GWT.gitignore
@@ -1,17 +1,16 @@
 *.class
 
 # Package Files #
 *.jar
 *.war
 
 # gwt caches and compiled units #
 war/gwt_bree/
 gwt-unitCache/
 
 # boilerplate generated classes #
 .apt_generated/
 
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
-
diff --git a/Global/Archives.gitignore b/Global/Archives.gitignore
index 82d3b10..e9eda68 100644
--- a/Global/Archives.gitignore
+++ b/Global/Archives.gitignore
@@ -1,23 +1,27 @@
 # It's better to unpack these files and commit the raw source because
 # git has its own built in compression methods.
 *.7z
 *.jar
 *.rar
 *.zip
 *.gz
 *.bzip
 *.bz2
 *.xz
 *.lzma
+*.cab
 
 #packing-only formats
 *.iso
 *.tar
 
 #package management formats
 *.dmg
 *.xpi
 *.gem
 *.egg
 *.deb
 *.rpm
+*.msi
+*.msm
+*.msp
diff --git a/Global/BricxCC.gitignore b/Global/BricxCC.gitignore
new file mode 100644
index 0000000..c1d16a4
--- /dev/null
+++ b/Global/BricxCC.gitignore
@@ -0,0 +1,4 @@
+# Bricx Command Center IDE
+# http://bricxcc.sourceforge.net
+*.bak
+*.sym
diff --git a/Global/CVS.gitignore b/Global/CVS.gitignore
index 0f0f06e..01ba863 100644
--- a/Global/CVS.gitignore
+++ b/Global/CVS.gitignore
@@ -1,4 +1,4 @@
 /CVS/*
 */CVS/*
 .cvsignore
-*/.cvsignore
\ No newline at end of file
+*/.cvsignore
diff --git a/Global/Cloud9.gitignore b/Global/Cloud9.gitignore
new file mode 100644
index 0000000..b9f8a36
--- /dev/null
+++ b/Global/Cloud9.gitignore
@@ -0,0 +1,2 @@
+# Cloud9 IDE - http://c9.io
+.c9revisions
diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
index 7b3ad03..7346871 100644
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -1,26 +1,28 @@
 *.pydevproject
-.project
 .metadata
+.gradle
 bin/**
 tmp/**
 tmp/**/*
 *.tmp
 *.bak
 *.swp
 *~.nib
 local.properties
-.classpath
 .settings/
 .loadpath
 
 # External tool builders
 .externalToolBuilders/
 
 # Locally stored "Eclipse launch configurations"
 *.launch
 
 # CDT-specific
 .cproject
 
 # PDT-specific
 .buildpath
+
+# TeXlipse plugin
+.texlipse
diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore
index 8c99610..ee3b865 100644
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -1,12 +1,16 @@
+# -*- mode: gitignore; -*-
 *~
 \#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
-.elc
+*.elc
 auto-save-list
 tramp
 .\#*
 
 # Org-mode
 .org-id-locations
 *_archive
+
+# flymake-mode
+*_flymake.*
diff --git a/Global/Ensime.gitignore b/Global/Ensime.gitignore
new file mode 100644
index 0000000..6d8c2b0
--- /dev/null
+++ b/Global/Ensime.gitignore
@@ -0,0 +1,3 @@
+# Ensime specific
+.ensime
+.ensime_lucene/
\ No newline at end of file
diff --git a/Global/Espresso.gitignore b/Global/Espresso.gitignore
index 1aaec9c..1234530 100644
--- a/Global/Espresso.gitignore
+++ b/Global/Espresso.gitignore
@@ -1 +1 @@
-*.esproj
\ No newline at end of file
+*.esproj
diff --git a/Global/FlexBuilder.gitignore b/Global/FlexBuilder.gitignore
index 8654394..b6ce3f1 100644
--- a/Global/FlexBuilder.gitignore
+++ b/Global/FlexBuilder.gitignore
@@ -1,2 +1,2 @@
 bin/
-bin-debug/
\ No newline at end of file
+bin-debug/
diff --git a/Global/IntelliJ.gitignore b/Global/IntelliJ.gitignore
deleted file mode 100644
index 7d89b9c..0000000
--- a/Global/IntelliJ.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.iml
-*.ipr
-*.iws
-.idea/
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
new file mode 100644
index 0000000..5db4d2e
--- /dev/null
+++ b/Global/JetBrains.gitignore
@@ -0,0 +1,23 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+
+## Directory-based project format
+.idea/
+# if you remove the above rule, at least ignore user-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# and these sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/
diff --git a/Global/KDevelop4.gitignore b/Global/KDevelop4.gitignore
new file mode 100644
index 0000000..7ac57b1
--- /dev/null
+++ b/Global/KDevelop4.gitignore
@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/
diff --git a/Global/Kate.gitignore b/Global/Kate.gitignore
new file mode 100644
index 0000000..7ff06ce
--- /dev/null
+++ b/Global/Kate.gitignore
@@ -0,0 +1,3 @@
+# Swap Files #
+.*.kate-swp
+.swp.*
diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore
index 151e299..b25c15b 100644
--- a/Global/Linux.gitignore
+++ b/Global/Linux.gitignore
@@ -1,3 +1 @@
-.*
-!.gitignore
 *~
diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore
index f52813b..79bc56c 100644
--- a/Global/Matlab.gitignore
+++ b/Global/Matlab.gitignore
@@ -1,16 +1,16 @@
 ##---------------------------------------------------
 ## Remove autosaves generated by the Matlab editor
 ## We have git for backups!
 ##---------------------------------------------------
 
 # Windows default autosave extension
 *.asv
 
 # OSX / *nix default autosave extension
 *.m~
 
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation	
+# Simulink Code Generation
 slprj/
diff --git a/Global/NotepadPP.gitignore b/Global/NotepadPP.gitignore
new file mode 100644
index 0000000..9ec9df1
--- /dev/null
+++ b/Global/NotepadPP.gitignore
@@ -0,0 +1,2 @@
+# Notepad++ backups #
+*.bak
\ No newline at end of file
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
index cf8db5d..65b9423 100644
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@@ -1,12 +1,13 @@
 .DS_Store
 .AppleDouble
 .LSOverride
-Icon
 
+# Icon must ends with two \r.
+Icon

 
 # Thumbnails
 ._*
 
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore
deleted file mode 100644
index 62c8935..0000000
--- a/Global/PhPStorm.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.idea/
\ No newline at end of file
diff --git a/Global/PyCharm.gitignore b/Global/PyCharm.gitignore
deleted file mode 100644
index 5727281..0000000
--- a/Global/PyCharm.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# PyCharm
-# http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
-.iml
diff --git a/Global/RubyMine.gitignore b/Global/RubyMine.gitignore
deleted file mode 100644
index 1cc4572..0000000
--- a/Global/RubyMine.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.idea/workspace.xml
diff --git a/Global/SASS.gitignore b/Global/SASS.gitignore
index 2c30607..c1df001 100644
--- a/Global/SASS.gitignore
+++ b/Global/SASS.gitignore
@@ -1,2 +1,2 @@
-### SASS Ignores - "Sassy CSS" http://sass-lang.com/
+### Sass Ignores - "Sassy CSS" http://sass-lang.com/
 *.sass-cache
diff --git a/Global/SBT.gitignore b/Global/SBT.gitignore
index 3dfc9d7..1f4d73b 100644
--- a/Global/SBT.gitignore
+++ b/Global/SBT.gitignore
@@ -1,7 +1,9 @@
 # SBT .gitignore
 # recommended: http://code.google.com/p/simple-build-tool/wiki/Setup#Version_Control
 
 target/
 lib_managed/
 src_managed/
-project/boot/
\ No newline at end of file
+project/boot/
+.history
+.cache
diff --git a/Global/SublimeText.gitignore b/Global/SublimeText.gitignore
index aea37e0..e5bfb72 100644
--- a/Global/SublimeText.gitignore
+++ b/Global/SublimeText.gitignore
@@ -1,2 +1,6 @@
-# SublimeText project files
+# workspace files are user-specific
 *.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
diff --git a/Global/Tags.gitignore b/Global/Tags.gitignore
index cc28fef..45922ec 100644
--- a/Global/Tags.gitignore
+++ b/Global/Tags.gitignore
@@ -1,5 +1,14 @@
-# Ignore tags created by etags and ctags
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
 !TAGS/
 tags
 !tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
+
diff --git a/Global/Vagrant.gitignore b/Global/Vagrant.gitignore
new file mode 100644
index 0000000..a977916
--- /dev/null
+++ b/Global/Vagrant.gitignore
@@ -0,0 +1 @@
+.vagrant/
diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore
index 351ec9d..41968b0 100644
--- a/Global/Windows.gitignore
+++ b/Global/Windows.gitignore
@@ -1,9 +1,15 @@
 # Windows image file caches
 Thumbs.db
 ehthumbs.db
 
 # Folder config file
 Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
diff --git a/Global/vim.gitignore b/Global/vim.gitignore
index 51514eb..6c5ee8d 100644
--- a/Global/vim.gitignore
+++ b/Global/vim.gitignore
@@ -1,5 +1,6 @@
-.*.s[a-w][a-z]
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist
 *~
diff --git a/Go.gitignore b/Go.gitignore
index 0026861..8365624 100644
--- a/Go.gitignore
+++ b/Go.gitignore
@@ -1,22 +1,23 @@
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
 *.a
 *.so
 
 # Folders
 _obj
 _test
 
 # Architecture specific extensions/prefixes
 *.[568vq]
 [568vq].out
 
 *.cgo1.go
 *.cgo2.c
 _cgo_defun.c
 _cgo_gotypes.go
 _cgo_export.*
 
 _testmain.go
 
 *.exe
+*.test
diff --git a/Grails.gitignore b/Grails.gitignore
index 96f72ec..4c0c15b 100644
--- a/Grails.gitignore
+++ b/Grails.gitignore
@@ -1,44 +1,42 @@
 # .gitignore for Grails 1.2 and 1.3
 
 # web application files
 /web-app/WEB-INF
 
 # IDE support files
 /.classpath
 /.launch
 /.project
 /.settings
 /*.launch
 /*.tmproj
 /ivy*
 /eclipse
 
 # default HSQL database files for production mode
 /prodDb.*
 
 # general HSQL database files
 *Db.properties
 *Db.script
 
 # logs
 /stacktrace.log
 /test/reports
 /logs
 
 # project release file
 /*.war
 
 # plugin release file
 /*.zip
 
 # older plugin install locations
 /plugins
 /web-app/plugins
-/web-app/WEB-INF/classes
 
 # "temporary" build files
 /target
 
 # other
 *.iws
-
diff --git a/Haskell.gitignore b/Haskell.gitignore
index 477a353..cc14307 100644
--- a/Haskell.gitignore
+++ b/Haskell.gitignore
@@ -1,7 +1,11 @@
 dist
 cabal-dev
 *.o
 *.hi
 *.chi
 *.chs.h
 .virthualenv
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+cabal.config
diff --git a/Jboss.gitignore b/Jboss.gitignore
index 5d7167f..75d1731 100644
--- a/Jboss.gitignore
+++ b/Jboss.gitignore
@@ -1,15 +1,19 @@
 jboss/server/all/deploy/project.ext
 jboss/server/default/deploy/project.ext
 jboss/server/minimal/deploy/project.ext
 jboss/server/all/log/*.log
 jboss/server/all/tmp/**/*
 jboss/server/all/data/**/*
 jboss/server/all/work/**/*
 jboss/server/default/log/*.log
 jboss/server/default/tmp/**/*
 jboss/server/default/data/**/*
 jboss/server/default/work/**/*
 jboss/server/minimal/log/*.log
 jboss/server/minimal/tmp/**/*
 jboss/server/minimal/data/**/*
 jboss/server/minimal/work/**/*
+
+# deployed package files #
+
+*.DEPLOYED
diff --git a/Joomla.gitignore b/Joomla.gitignore
index bcd6feb..54825f4 100644
--- a/Joomla.gitignore
+++ b/Joomla.gitignore
@@ -1,396 +1,396 @@
 .gitignore
 .htaccess
 administrator/cache/*
 administrator/components/com_admin/*
 administrator/components/com_banners/*
 administrator/components/com_cache/*
 administrator/components/com_categories/*
 administrator/components/com_checkin/*
 administrator/components/com_config/*
 administrator/components/com_contact/*
 administrator/components/com_content/*
 administrator/components/com_cpanel/*
 administrator/components/com_installer/*
 administrator/components/com_languages/*
 administrator/components/com_login/*
 administrator/components/com_media/*
 administrator/components/com_menus/*
 administrator/components/com_messages/*
 administrator/components/com_modules/*
 administrator/components/com_newsfeeds/*
 administrator/components/com_plugins/*
 administrator/components/com_redirect/*
 administrator/components/com_search/*
 administrator/components/com_templates/*
 administrator/components/com_users/*
 administrator/components/com_weblinks/*
 administrator/components/index.html
 administrator/help/*
 administrator/includes/*
 administrator/language/en-GB/
 administrator/language/en-GB/en-GB.com_admin.ini
 administrator/language/en-GB/en-GB.com_admin.sys.ini
 administrator/language/en-GB/en-GB.com_banners.ini
 administrator/language/en-GB/en-GB.com_banners.sys.ini
 administrator/language/en-GB/en-GB.com_cache.ini
 administrator/language/en-GB/en-GB.com_cache.sys.ini
 administrator/language/en-GB/en-GB.com_categories.ini
 administrator/language/en-GB/en-GB.com_categories.sys.ini
 administrator/language/en-GB/en-GB.com_checkin.ini
 administrator/language/en-GB/en-GB.com_checkin.sys.ini
 administrator/language/en-GB/en-GB.com_config.ini
 administrator/language/en-GB/en-GB.com_config.sys.ini
 administrator/language/en-GB/en-GB.com_contact.ini
 administrator/language/en-GB/en-GB.com_contact.sys.ini
 administrator/language/en-GB/en-GB.com_content.ini
 administrator/language/en-GB/en-GB.com_content.sys.ini
 administrator/language/en-GB/en-GB.com_cpanel.ini
 administrator/language/en-GB/en-GB.com_cpanel.sys.ini
 administrator/language/en-GB/en-GB.com_installer.ini
 administrator/language/en-GB/en-GB.com_installer.sys.ini
 administrator/language/en-GB/en-GB.com_languages.ini
 administrator/language/en-GB/en-GB.com_languages.sys.ini
 administrator/language/en-GB/en-GB.com_login.ini
 administrator/language/en-GB/en-GB.com_login.sys.ini
 administrator/language/en-GB/en-GB.com_mailto.sys.ini
 administrator/language/en-GB/en-GB.com_media.ini
 administrator/language/en-GB/en-GB.com_media.sys.ini
 administrator/language/en-GB/en-GB.com_menus.ini
 administrator/language/en-GB/en-GB.com_menus.sys.ini
 administrator/language/en-GB/en-GB.com_messages.ini
 administrator/language/en-GB/en-GB.com_messages.sys.ini
 administrator/language/en-GB/en-GB.com_modules.ini
 administrator/language/en-GB/en-GB.com_modules.sys.ini
 administrator/language/en-GB/en-GB.com_newsfeeds.ini
 administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
 administrator/language/en-GB/en-GB.com_plugins.ini
 administrator/language/en-GB/en-GB.com_plugins.sys.ini
 administrator/language/en-GB/en-GB.com_redirect.ini
 administrator/language/en-GB/en-GB.com_redirect.sys.ini
 administrator/language/en-GB/en-GB.com_search.ini
 administrator/language/en-GB/en-GB.com_search.sys.ini
 administrator/language/en-GB/en-GB.com_templates.ini
 administrator/language/en-GB/en-GB.com_templates.sys.ini
 administrator/language/en-GB/en-GB.com_users.ini
 administrator/language/en-GB/en-GB.com_users.sys.ini
 administrator/language/en-GB/en-GB.com_weblinks.ini
 administrator/language/en-GB/en-GB.com_weblinks.sys.ini
 administrator/language/en-GB/en-GB.com_wrapper.ini
 administrator/language/en-GB/en-GB.com_wrapper.sys.ini
 administrator/language/en-GB/en-GB.ini
 administrator/language/en-GB/en-GB.lib_joomla.ini
 administrator/language/en-GB/en-GB.localise.php
 administrator/language/en-GB/en-GB.mod_custom.ini
 administrator/language/en-GB/en-GB.mod_custom.sys.ini
 administrator/language/en-GB/en-GB.mod_feed.ini
 administrator/language/en-GB/en-GB.mod_feed.sys.ini
 administrator/language/en-GB/en-GB.mod_latest.ini
 administrator/language/en-GB/en-GB.mod_latest.sys.ini
 administrator/language/en-GB/en-GB.mod_logged.ini
 administrator/language/en-GB/en-GB.mod_logged.sys.ini
 administrator/language/en-GB/en-GB.mod_login.ini
 administrator/language/en-GB/en-GB.mod_login.sys.ini
 administrator/language/en-GB/en-GB.mod_menu.ini
 administrator/language/en-GB/en-GB.mod_menu.sys.ini
 administrator/language/en-GB/en-GB.mod_online.ini
 administrator/language/en-GB/en-GB.mod_online.sys.ini
 administrator/language/en-GB/en-GB.mod_popular.ini
 administrator/language/en-GB/en-GB.mod_popular.sys.ini
 administrator/language/en-GB/en-GB.mod_quickicon.ini
 administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
 administrator/language/en-GB/en-GB.mod_status.ini
 administrator/language/en-GB/en-GB.mod_status.sys.ini
 administrator/language/en-GB/en-GB.mod_submenu.ini
 administrator/language/en-GB/en-GB.mod_submenu.sys.ini
 administrator/language/en-GB/en-GB.mod_title.ini
 administrator/language/en-GB/en-GB.mod_title.sys.ini
 administrator/language/en-GB/en-GB.mod_toolbar.ini
 administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
 administrator/language/en-GB/en-GB.mod_unread.ini
 administrator/language/en-GB/en-GB.mod_unread.sys.ini
 administrator/language/en-GB/en-GB.plg_authentication_example.ini
 administrator/language/en-GB/en-GB.plg_authentication_example.sys.ini
 administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
 administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
 administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
 administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
 administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
 administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
 administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
 administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
 administrator/language/en-GB/en-GB.plg_content_geshi.ini
 administrator/language/en-GB/en-GB.plg_content_geshi.sys.ini
 administrator/language/en-GB/en-GB.plg_content_joomla.ini
 administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
 administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
 administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
 administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
 administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
 administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
 administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
 administrator/language/en-GB/en-GB.plg_content_vote.ini
 administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
 administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
 administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
 administrator/language/en-GB/en-GB.plg_editors_none.ini
 administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
 administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
 administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
 administrator/language/en-GB/en-GB.plg_extension_joomla.ini
 administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
 administrator/language/en-GB/en-GB.plg_search_categories.ini
 administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
 administrator/language/en-GB/en-GB.plg_search_contacts.ini
 administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
 administrator/language/en-GB/en-GB.plg_search_content.ini
 administrator/language/en-GB/en-GB.plg_search_content.sys.ini
 administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
 administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
 administrator/language/en-GB/en-GB.plg_search_weblinks.ini
 administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
 administrator/language/en-GB/en-GB.plg_system_cache.ini
 administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
 administrator/language/en-GB/en-GB.plg_system_debug.ini
 administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
 administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
 administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
 administrator/language/en-GB/en-GB.plg_system_log.ini
 administrator/language/en-GB/en-GB.plg_system_logout.ini
 administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
 administrator/language/en-GB/en-GB.plg_system_log.sys.ini
 administrator/language/en-GB/en-GB.plg_system_p3p.ini
 administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
 administrator/language/en-GB/en-GB.plg_system_redirect.ini
 administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
 administrator/language/en-GB/en-GB.plg_system_remember.ini
 administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
 administrator/language/en-GB/en-GB.plg_system_sef.ini
 administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
 administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
 administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
 administrator/language/en-GB/en-GB.plg_user_joomla.ini
 administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
 administrator/language/en-GB/en-GB.plg_user_profile.ini
 administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
 administrator/language/en-GB/en-GB.tpl_bluestork.ini
 administrator/language/en-GB/en-GB.tpl_bluestork.sys.ini
 administrator/language/en-GB/en-GB.tpl_hathor.ini
 administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
 administrator/language/en-GB/en-GB.xml
 administrator/language/en-GB/index.html
 administrator/language/overrides/*
 administrator/language/index.html
 administrator/manifests/*
 administrator/modules/mod_custom/*
 administrator/modules/mod_feed/*
 administrator/modules/mod_latest/*
 administrator/modules/mod_logged/*
 administrator/modules/mod_login/*
 administrator/modules/mod_menu/*
 administrator/modules/mod_online/*
 administrator/modules/mod_popular/*
 administrator/modules/mod_quickicon/*
 administrator/modules/mod_status/*
 administrator/modules/mod_submenu/*
 administrator/modules/mod_title/*
 administrator/modules/mod_toolbar/*
 administrator/modules/mod_unread/*
 administrator/modules/index.html
 administrator/templates/bluestork/*
 administrator/templates/hathor/*
 administrator/templates/system/*
 administrator/templates/index.html
 administrator/index.php
 cache/*
 components/com_banners/*
 components/com_contact/*
 components/com_content/*
 components/com_mailto/*
 components/com_media/*
 components/com_newsfeeds/*
 components/com_search/*
 components/com_users/*
 components/com_weblinks/*
 components/com_wrapper/*
 components/index.html
 images/banners/*
 images/sampledata/*
 images/joomla*
 images/index.html
 images/powered_by.png
 includes/*
 installation/*
 language/en-GB/en-GB.com_contact.ini
 language/en-GB/en-GB.com_content.ini
 language/en-GB/en-GB.com_mailto.ini
 language/en-GB/en-GB.com_media.ini
 language/en-GB/en-GB.com_messages.ini
 language/en-GB/en-GB.com_newsfeeds.ini
 language/en-GB/en-GB.com_search.ini
 language/en-GB/en-GB.com_users.ini
 language/en-GB/en-GB.com_weblinks.ini
 language/en-GB/en-GB.com_wrapper.ini
 language/en-GB/en-GB.files_joomla.sys.ini
 language/en-GB/en-GB.ini
 language/en-GB/en-GB.lib_joomla.ini
 language/en-GB/en-GB.localise.php
 language/en-GB/en-GB.mod_articles_archive.ini
 language/en-GB/en-GB.mod_articles_archive.sys.ini
 language/en-GB/en-GB.mod_articles_categories.ini
 language/en-GB/en-GB.mod_articles_categories.sys.ini
 language/en-GB/en-GB.mod_articles_category.ini
 language/en-GB/en-GB.mod_articles_category.sys.ini
 language/en-GB/en-GB.mod_articles_latest.ini
 language/en-GB/en-GB.mod_articles_latest.sys.ini
 language/en-GB/en-GB.mod_articles_news.ini
 language/en-GB/en-GB.mod_articles_news.sys.ini
 language/en-GB/en-GB.mod_articles_popular.ini
 language/en-GB/en-GB.mod_articles_popular.sys.ini
 language/en-GB/en-GB.mod_banners.ini
 language/en-GB/en-GB.mod_banners.sys.ini
 language/en-GB/en-GB.mod_breadcrumbs.ini
 language/en-GB/en-GB.mod_breadcrumbs.sys.ini
 language/en-GB/en-GB.mod_custom.ini
 language/en-GB/en-GB.mod_custom.sys.ini
 language/en-GB/en-GB.mod_feed.ini
 language/en-GB/en-GB.mod_feed.sys.ini
 language/en-GB/en-GB.mod_footer.ini
 language/en-GB/en-GB.mod_footer.sys.ini
 language/en-GB/en-GB.mod_languages.ini
 language/en-GB/en-GB.mod_languages.sys.ini
 language/en-GB/en-GB.mod_login.ini
 language/en-GB/en-GB.mod_login.sys.ini
 language/en-GB/en-GB.mod_menu.ini
 language/en-GB/en-GB.mod_menu.sys.ini
 language/en-GB/en-GB.mod_random_image.ini
 language/en-GB/en-GB.mod_random_image.sys.ini
 language/en-GB/en-GB.mod_related_items.ini
 language/en-GB/en-GB.mod_related_items.sys.ini
 language/en-GB/en-GB.mod_search.ini
 language/en-GB/en-GB.mod_search.sys.ini
 language/en-GB/en-GB.mod_stats.ini
 language/en-GB/en-GB.mod_stats.sys.ini
 language/en-GB/en-GB.mod_syndicate.ini
 language/en-GB/en-GB.mod_syndicate.sys.ini
 language/en-GB/en-GB.mod_users_latest.ini
 language/en-GB/en-GB.mod_users_latest.sys.ini
 language/en-GB/en-GB.mod_weblinks.ini
 language/en-GB/en-GB.mod_weblinks.sys.ini
 language/en-GB/en-GB.mod_whosonline.ini
 language/en-GB/en-GB.mod_whosonline.sys.ini
 language/en-GB/en-GB.mod_wrapper.ini
 language/en-GB/en-GB.mod_wrapper.sys.ini
 language/en-GB/en-GB.tpl_atomic.ini
 language/en-GB/en-GB.tpl_atomic.sys.ini
 language/en-GB/en-GB.tpl_beez_20.ini
 language/en-GB/en-GB.tpl_beez_20.sys.ini
 language/en-GB/en-GB.tpl_beez5.ini
 language/en-GB/en-GB.tpl_beez5.sys.ini
 language/en-GB/en-GB.xml
 language/en-GB/index.html
 language/overrides/*
 language/index.html
 libraries/joomla/*
 libraries/phpmailer/*
 libraries/phputf8/*
 libraries/simplepie/*
 libraries/index.html
 libraries/loader.php
 logs/*
 media/contacts/*
 media/editors/*
 media/mailto/*
 media/media/*
 media/mod_languages/*
 media/system/*
 media/index.html
 modules/mod_articles_archive/*
 modules/mod_articles_categories/*
 modules/mod_articles_category/*
 modules/mod_articles_latest/*
 modules/mod_articles_news/*
 modules/mod_articles_popular/*
 modules/mod_banners/*
 modules/mod_breadcrumbs/*
 modules/mod_custom/*
 modules/mod_feed/*
 modules/mod_footer/*
 modules/mod_languages/*
 modules/mod_login/*
 modules/mod_menu/*
 modules/mod_random_image/*
 modules/mod_related_items/*
 modules/mod_search/*
 modules/mod_stats/*
 modules/mod_syndicate/*
 modules/mod_users_latest/*
 modules/mod_weblinks/*
 modules/mod_whosonline/*
 modules/mod_wrapper/*
 modules/index.html
 plugins/authentication/example/*
 plugins/authentication/gmail/*
 plugins/authentication/joomla/*
 plugins/authentication/ldap/*
 plugins/authentication/index.html
 plugins/content/emailcloak/*
 plugins/content/example/*
 plugins/content/geshi/*
 plugins/content/joomla/*
 plugins/content/loadmodule/*
 plugins/content/pagebreak/*
 plugins/content/pagenavigation/*
 plugins/content/vote/*
 plugins/content/index.html
 plugins/editors/codemirror/*
 plugins/editors/none/*
 plugins/editors/tinymce/*
 plugins/editors/index.html
 plugins/editors-xtd/article/*
 plugins/editors-xtd/image/*
 plugins/editors-xtd/pagebreak/*
 plugins/editors-xtd/readmore/*
 plugins/editors-xtd/index.html
 plugins/extension/example/*
 plugins/extension/joomla/*
 plugins/extension/index.html
 plugins/search/categories/*
 plugins/search/contacts/*
 plugins/search/content/*
 plugins/search/newsfeeds/*
 plugins/search/weblinks/*
 plugins/search/index.html
 plugins/system/cache/*
 plugins/system/debug/*
 plugins/system/languagefilter/*
 plugins/system/log/*
 plugins/system/logout/*
 plugins/system/p3p/*
 plugins/system/redirect/*
 plugins/system/remember/*
 plugins/system/sef/*
 plugins/system/index.html
 plugins/user/contactcreator/*
 plugins/user/example/*
 plugins/user/joomla/*
 plugins/user/profile/*
 plugins/user/index.html
 plugins/index.html
 templates/atomic/*
 templates/beez_20/*
 templates/beez5/*
 templates/system/*
 templates/index.html
 tmp/*
 configuration.php
 index.php
 joomla.xml
-*.txt
\ No newline at end of file
+*.txt
diff --git a/Kohana.gitignore b/Kohana.gitignore
index 42d7030..8b2ab01 100644
--- a/Kohana.gitignore
+++ b/Kohana.gitignore
@@ -1,2 +1,2 @@
 application/cache/*
-application/logs/*
\ No newline at end of file
+application/logs/*
diff --git a/LICENSE b/LICENSE
index 0f05796..f247e59 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,19 +1,19 @@
-Copyright (c) 2012 GitHub, Inc.
+Copyright (c) 2013 GitHub, Inc.
 
 Permission is hereby granted,  free of charge,  to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation
 the rights to  use, copy, modify, merge, publish, distribute, sublicense,
 and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
diff --git a/LaTeX.gitignore b/LaTeX.gitignore
deleted file mode 100644
index bbaaa01..0000000
--- a/LaTeX.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.acn
-*.acr
-*.alg
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb_latexmk
-*.glg
-*.glo
-*.gls
-*.idx
-*.ilg
-*.ind
-*.ist
-*.lof
-*.log
-*.lot
-*.maf
-*.mtc
-*.mtc0
-*.nav
-*.nlo
-*.out
-*.pdfsync
-*.ps
-*.snm
-*.synctex.gz
-*.toc
-*.vrb
-*.xdy
-*.tdo
diff --git a/Leiningen.gitignore b/Leiningen.gitignore
index 40fbb28..b8d3245 100644
--- a/Leiningen.gitignore
+++ b/Leiningen.gitignore
@@ -1,6 +1,8 @@
 pom.xml
 *jar
 /lib/
 /classes/
-/targets/
+/target/
 .lein-deps-sum
+.lein-repl-history
+.lein-plugins/
diff --git a/LemonStand.gitignore b/LemonStand.gitignore
index bc59f9c..c7d94ad 100644
--- a/LemonStand.gitignore
+++ b/LemonStand.gitignore
@@ -1,21 +1,21 @@
 boot.php
 index.php
 install.php
 /config/*
 !/config/config.php
 /controllers/*
 /init/*
 /logs/*
 /phproad/*
 /temp/*
 /uploaded/*
 /installer_files/*
 /modules/backend/*
 /modules/blog/*
 /modules/cms/*
 /modules/core/*
 /modules/session/*
 /modules/shop/*
 /modules/system/*
 /modules/users/*
-# add content_*.php if you don't want erase client changes to content
\ No newline at end of file
+# add content_*.php if you don't want erase client changes to content
diff --git a/Magento.gitignore b/Magento.gitignore
index 52e8bb2..7eac466 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -1,107 +1,115 @@
 .modgit/
 app/code/community/Find/
 app/code/community/Phoenix/
 app/code/core/
 app/design/adminhtml/default/default/
 app/design/adminhtml/default/find/
 app/design/frontend/base/
 app/design/frontend/default/blank/
 app/design/frontend/default/default/
 app/design/frontend/default/iphone/
 app/design/frontend/default/modern/
 app/design/frontend/enterprise/default
 app/design/install/
 app/etc/modules/Enterprise_*
 app/etc/modules/Find_Feed.xml
 app/etc/modules/Mage_All.xml
 app/etc/modules/Mage_Api.xml
+app/etc/modules/Mage_Api2.xml
 app/etc/modules/Mage_Authorizenet.xml
 app/etc/modules/Mage_Bundle.xml
+app/etc/modules/Mage_Captcha.xml
 app/etc/modules/Mage_Centinel.xml
 app/etc/modules/Mage_Compiler.xml
 app/etc/modules/Mage_Connect.xml
+app/etc/modules/Mage_CurrencySymbol.xml
 app/etc/modules/Mage_Downloadable.xml
 app/etc/modules/Mage_ImportExport.xml
 app/etc/modules/Mage_LoadTest.xml
+app/etc/modules/Mage_Oauth.xml
 app/etc/modules/Mage_PageCache.xml
 app/etc/modules/Mage_Persistent.xml
 app/etc/modules/Mage_Weee.xml
 app/etc/modules/Mage_Widget.xml
 app/etc/modules/Mage_XmlConnect.xml
 app/etc/modules/Phoenix_Moneybookers.xml
 app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional
 app/etc/local.xml.template
+app/etc/local.xml
 app/.htaccess
 app/locale/
 app/Mage.php
 cron.php
 cron.sh
 downloader/
 errors/
 favicon.ico
 get.php
 includes/
 index.php
 index.php.sample
-install.php
+/install.php
 js/blank.html
 js/calendar/
 js/enterprise/
 js/extjs/
 js/firebug/
 js/flash/
 js/index.php
 js/jscolor/
 js/lib/
 js/mage/
 js/prototype/
 js/scriptaculous/
 js/spacer.gif
 js/tiny_mce/
 js/varien/
 lib/3Dsecure/
 lib/Apache/
 lib/flex/
 lib/googlecheckout/
 lib/.htaccess
 lib/LinLibertineFont/
 lib/Mage/
 lib/PEAR/
 lib/phpseclib/
 lib/Varien/
 lib/Zend/
 LICENSE_AFL.txt
 LICENSE.html
 LICENSE.txt
 LICENSE_EE*
 mage
 media/customer/
+media/dhl/
 media/downloadable/
 media/.htaccess
 media/import/
 media/xmlconnect/
+media/catalog/product/cache/
+
 nbproject/
 pear
 pear/
 php.ini.sample
 pkginfo/
 RELEASE_NOTES.txt
 shell/abstract.php
 shell/compiler.php
 shell/indexer.php
 shell/log.php
 skin/adminhtml/default/default/
 skin/adminhtml/default/enterprise
 skin/frontend/base/
 skin/frontend/default/blank/
 skin/frontend/default/blue/
 skin/frontend/default/default/
 skin/frontend/default/french/
 skin/frontend/default/german/
 skin/frontend/default/iphone/
 skin/frontend/default/modern/
 skin/frontend/enterprise
 skin/install/
 var/
diff --git a/Maven.gitignore b/Maven.gitignore
index 2f7896d..6ca4036 100644
--- a/Maven.gitignore
+++ b/Maven.gitignore
@@ -1 +1,2 @@
 target/
+ *.releaseBackup
diff --git a/Meteor.gitignore b/Meteor.gitignore
new file mode 100644
index 0000000..6a6ea0e
--- /dev/null
+++ b/Meteor.gitignore
@@ -0,0 +1,2 @@
+.meteor/local
+.meteor/meteorite
\ No newline at end of file
diff --git a/Node.gitignore b/Node.gitignore
index 4d063b5..cfdef68 100644
--- a/Node.gitignore
+++ b/Node.gitignore
@@ -1,15 +1,14 @@
 lib-cov
 *.seed
 *.log
 *.csv
 *.dat
 *.out
 *.pid
 *.gz
 
 pids
 logs
 results
 
-npm-debug.log
-node_modules
\ No newline at end of file
+node_modules
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
index 31e6fd9..af228cd 100644
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -1,17 +1,23 @@
-# Xcode
+# OS X
 .DS_Store
-*/build/*
+
+# Xcode
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
 !default.mode1v3
 *.mode2v3
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+*.xccheckout
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
+*.xccheckout
+
+# CocoaPods
+Pods
diff --git a/Perl.gitignore b/Perl.gitignore
index c15b52a..eaca02e 100644
--- a/Perl.gitignore
+++ b/Perl.gitignore
@@ -1,16 +1,19 @@
-blib/
-.build/
+/blib/
+/.build/
 _build/
 cover_db/
 inc/
 Build
 !Build/
 Build.bat
 .last_cover_stats
-Makefile
-Makefile.old
-MANIFEST.bak
-META.yml
-MYMETA.yml
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/META.yml
+/META.json
+/MYMETA.*
 nytprof.out
-pm_to_blib
+/pm_to_blib
+*.o
+*.bs
diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
index 663eb67..ed27485 100644
--- a/PlayFramework.gitignore
+++ b/PlayFramework.gitignore
@@ -1,22 +1,17 @@
-# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
-# Ignore all dotfiles...
-.*
-# except for .gitignore
-!.gitignore
-
 # Ignore Play! working directory #
+bin
 db
 eclipse
 lib
 log
 logs
 modules
 precompiled
 project/project
 project/target
 target
 tmp
 test-result
 server.pid
 *.iml
 *.eml
diff --git a/Plone.gitignore b/Plone.gitignore
index 13edefa..770a868 100644
--- a/Plone.gitignore
+++ b/Plone.gitignore
@@ -1,34 +1,18 @@
-*~
 *.pyc
 *.pyo
 *.tmp*
 *.mo
 *.egg
 *.EGG
 *.egg-info
 *.EGG-INFO
-*.kpf
-*.swp
-*.wpr
 .*.cfg
-.installed.cfg
-.mr.developer.cfg
-.hg/
-.bzr/
-.svn/
-.project
-.pydevproject
 bin/
 build/
 develop-eggs/
 downloads/
 eggs/
 fake-eggs/
 parts/
 dist/
 var/
-
-
-
-# OSX
-.DS_Store
diff --git a/Prestashop.gitignore b/Prestashop.gitignore
new file mode 100644
index 0000000..e957df9
--- /dev/null
+++ b/Prestashop.gitignore
@@ -0,0 +1,29 @@
+# Directories content
+cache/class_index.php
+cache/smarty/cache/*
+!cache/smarty/cache/index.php
+cache/smarty/compile/*
+!cache/smarty/compile/index.php
+cache/tcpdf/*
+!cache/tcpdf/index.php
+
+config/xml/*.xml
+config/settings.inc.php
+
+log/*.log
+
+img/*
+!img/index.php
+!img/*/index.php
+
+tools/smarty*/cache/*.php
+!tools/smarty*/cache/index.php
+tools/smarty*/compile/*.php
+!tools/smarty*/compile/index.php
+
+themes/default/cache/*.js
+themes/default/cache/*.css
+
+# Ignore files on root directory
+robots.txt
+sitemap.xml
\ No newline at end of file
diff --git a/Processing.gitignore b/Processing.gitignore
new file mode 100644
index 0000000..85f269a
--- /dev/null
+++ b/Processing.gitignore
@@ -0,0 +1,7 @@
+.DS_Store
+applet
+application.linux32
+application.linux64
+application.windows32
+application.windows64
+application.macosx
diff --git a/Python.gitignore b/Python.gitignore
index ded6067..3d57845 100644
--- a/Python.gitignore
+++ b/Python.gitignore
@@ -1,36 +1,48 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
 
 # C extensions
 *.so
 
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
+# Distribution / packaging
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
 .installed.cfg
-lib
-lib64
-__pycache__
+*.egg
 
 # Installer logs
 pip-log.txt
+pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+.tox/
 .coverage
-.tox
+.cache
 nosetests.xml
+coverage.xml
 
 # Translations
 *.mo
 
 # Mr Developer
 .mr.developer.cfg
 .project
 .pydevproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
+
diff --git a/Qt.gitignore b/Qt.gitignore
index 16b4ee5..29d98c9 100644
--- a/Qt.gitignore
+++ b/Qt.gitignore
@@ -1,20 +1,25 @@
 # C++ objects and libs
 
 *.slo
 *.lo
 *.o
 *.a
 *.la
 *.lai
 *.so
 *.dll
 *.dylib
 
 # Qt-es
 
 *.pro.user
 *.pro.user.*
 moc_*.cpp
 qrc_*.cpp
-Makefile
+ui_*.h
+Makefile*
 *-build-*
+
+# QtCreator
+
+*.autosave
diff --git a/R.gitignore b/R.gitignore
index 42effd3..a0fd3b3 100644
--- a/R.gitignore
+++ b/R.gitignore
@@ -1,5 +1,5 @@
 # History files
 .Rhistory
 
 # Example code in package build process
-*-Ex.R
\ No newline at end of file
+*-Ex.R
diff --git a/README.md b/README.md
index 66c163a..14042e9 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,79 @@
-# A Collection of Useful .gitignore Templates
+# A collection of `.gitignore` templates
 
-That's what we're trying to build. Please contribute
-by [forking][fk] and sending a [pull request][pr].
+This is GitHub’s collection of [`.gitignore`][man] file templates.
+We use this list to populate the `.gitignore` template choosers available
+in the GitHub.com interface when creating new repositories and files.
 
-Also **please** only modify **one file** per commit. This'll
-make merging easier for everyone.
+For more information about how `.gitignore` files work, and how to use them,
+the following resources are a great place to start:
 
-Global gitignores (OS-specific, editor-specific) should go into the
-`Global/` directory.
+- The [Ignoring Files chapter][chapter] of the [Pro Git][progit] book.
+- The [Ignoring Files article][help] on the GitHub Help site.
+- The [gitignore(5)][man] manual page.
 
-For more information on gitignore: [gitignore(5)][g5]
+[man]: http://git-scm.com/docs/gitignore
+[help]: https://help.github.com/articles/ignoring-files
+[chapter]: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files
+[progit]: http://git-scm.com/book
 
-[fk]: http://help.github.com/forking/
-[pr]: http://help.github.com/pull-requests/
-[g5]: http://man.cx/gitignore
+## Folder structure
+
+The files in the root directory are for `.gitignore` templates that are
+project specific, such as language or framework specific templates.
+Global (operating system or editor specific) templates should go into the
+[`Global/`](./Global) directory.
+
+## Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
 
-## Pull Requests
+- **Provide a link to the application or project’s homepage**. Unless it’s
+  extremely popular, there’s a chance the maintainers don’t know about or use
+  the language, framework, editor, app, or project your change applies to.
+  
+- **Provide links to documentation** supporting the change you’re making.
+  Current, canonical documentation mentioning the files being ignored is best.
+  If documentation isn’t available to support your change, do the best you can
+  to explain what the files being ignored are for.
+  
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+  take a sentence or two to tell us why your change or addition should happen.
+  It’s especially helpful to articulate why this change applies to *everyone*
+  who works with the applicable technology, rather than just you or your team.
+  
+- **Please consider the scope of your change**. If your change specific to a
+  certain language or framework, then make sure the change is made to the
+  template for that language or framework, rather than to the template for an
+  editor, tool, or operating system.
 
-Since this repo includes a large and diverse
-number of programming languages, frameworks, editors,
-and ecosystems, it's **very helpful** if you can provide 
-a link to information supporting your pull request. 
-Up-to-date, canonical documentation that mentions the files 
-to be ignored is best.
+- **Please only modify *one template* per pull request**. This helps keep pull
+  requests and feedback focused on a specific project or technology.
 
-This ensures we can efficiently go through pull requests
-and keep quality high.
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
 
-## Global Ignores
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.
 
-git has a global configuration that applies rules to all of
-your projects. For example:
+## Contributing workflow
 
-    git config --global core.excludesfile ~/.global_ignore
+Here’s how we suggest you go about proposing a change to this project:
+
+1. [Fork this project][fork] to your account.
+2. [Create a branch][branch] for the change you intend to make.
+3. Make your changes to your fork.
+4. [Send a pull request][pr] from your fork’s branch to our `master` branch.
+
+Using the web-based interface to make changes is fine too, and will help you
+by automatically forking the project and prompting to send a pull request too.
+
+[fork]: http://help.github.com/forking/
+[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
+[pr]: http://help.github.com/pull-requests/
 
-... will apply the rules in ~/.global_ignore for all of your repos.
+## License
 
-This is useful if you use an editor (like Emacs) that drops backup files,
-or if you work in an environment that generates binary or intermediate
-files that are always ignored.
+[MIT](./LICENSE).
diff --git a/Rails.gitignore b/Rails.gitignore
index bf692e1..b4be5c7 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -1,18 +1,25 @@
 *.rbc
 *.sassc
 .sass-cache
 capybara-*.html
 .rspec
-.rvmrc
-/.bundle
-/vendor/bundle
-/log/*
-/tmp/*
+/log
+/tmp
 /db/*.sqlite3
-/public/system/*
+/public/system
 /coverage/
-/spec/tmp/*
+/spec/tmp
 **.orig
 rerun.txt
 pickle-email-*.html
-.project
+config/initializers/secret_token.rb
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/Ruby.gitignore b/Ruby.gitignore
index 560d1a6..99e72c1 100644
--- a/Ruby.gitignore
+++ b/Ruby.gitignore
@@ -1,18 +1,29 @@
 *.gem
 *.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
 
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/RubyMotion.gitignore b/RubyMotion.gitignore
new file mode 100644
index 0000000..7e39517
--- /dev/null
+++ b/RubyMotion.gitignore
@@ -0,0 +1,20 @@
+.dat*
+.repl_history
+build/
+tags
+
+# Editor files
+.DS_Store
+nbproject
+.redcar
+*.swp
+*.swo
+~
+.eprj
+vendor/Pods
+*.nib
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
diff --git a/Scala.gitignore b/Scala.gitignore
index f5b7d72..28adf31 100644
--- a/Scala.gitignore
+++ b/Scala.gitignore
@@ -1,13 +1,16 @@
 *.class
 *.log
 
 # sbt specific
+.cache/
+.history/
+.lib/
 dist/*
 target/
 lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
 
 # Scala-IDE specific
-.scala_dependencies
\ No newline at end of file
+.scala_dependencies
diff --git a/Sdcc.gitignore b/Sdcc.gitignore
index a4cb9fc..07ee7d5 100644
--- a/Sdcc.gitignore
+++ b/Sdcc.gitignore
@@ -1,9 +1,8 @@
 # SDCC stuff
 *.lnk
 *.lst
 *.map
 *.mem
 *.rel
 *.rst
 *.sym
-
diff --git a/Symfony.gitignore b/Symfony.gitignore
index ac10ca8..e5d08cb 100644
--- a/Symfony.gitignore
+++ b/Symfony.gitignore
@@ -1,15 +1,15 @@
 cache/*
 log/*
 web/uploads/*
 config/databases.yml
 config/propel.ini
 data/sql/*
 lib/filter/doctrine/base/Base*
 lib/filter/doctrine/*Plugin/base/Base*
 lib/form/doctrine/base/Base*
 lib/form/doctrine/*Plugin/base/Base*
 lib/model/doctrine/base/Base*
 lib/model/doctrine/*Plugin/base/Base*
 lib/model/om/*
 lib/model/map/*
-web/*Plugin/*
\ No newline at end of file
+web/*Plugin/*
diff --git a/Symfony2.gitignore b/Symfony2.gitignore
index 0b2956f..f4a95cb 100644
--- a/Symfony2.gitignore
+++ b/Symfony2.gitignore
@@ -1,13 +1,16 @@
 # Bootstrap
 app/bootstrap*
 
 # Symfony directories
 vendor/*
 */logs/*
 */cache/*
 web/uploads/*
 web/bundles/*
 
 # Configuration files
 app/config/parameters.ini
 app/config/parameters.yml
+
+# Composer
+composer.phar
\ No newline at end of file
diff --git a/TeX.gitignore b/TeX.gitignore
new file mode 100644
index 0000000..b0a911e
--- /dev/null
+++ b/TeX.gitignore
@@ -0,0 +1,78 @@
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+
+## Intermediate documents:
+*.dvi
+# these rules might exclude image files for figures etc.
+# *.ps
+# *.eps
+# *.pdf
+
+## Bibliography auxiliary files (bibtex/biblatex/biber):
+*.bbl
+*.bcf
+*.blg
+*-blx.aux
+*-blx.bib
+*.run.xml
+
+## Build tool auxiliary files:
+*.fdb_latexmk
+*.synctex.gz
+*.pdfsync
+
+## Auxiliary and intermediate files from other packages:
+
+# algorithms
+*.alg
+*.loa
+
+# amsthm
+*.thm
+
+# beamer
+*.nav
+*.snm
+*.vrb
+
+# glossaries
+*.acn
+*.acr
+*.glg
+*.glo
+*.gls
+
+# hyperref
+*.brf
+
+# listings
+*.lol
+
+# makeidx
+*.idx
+*.ilg
+*.ind
+*.ist
+
+# minitoc
+*.maf
+*.mtc
+*.mtc0
+
+# minted
+*.pyg
+
+# nomencl
+*.nlo
+
+# todonotes
+*.tdo
+
+# xindy
+*.xdy
diff --git a/Typo3.gitignore b/Typo3.gitignore
index 0ee23cb..d1593b1 100644
--- a/Typo3.gitignore
+++ b/Typo3.gitignore
@@ -1,18 +1,18 @@
-## Typo3
+## TYPO3 v4
 # Ignore serveral upload and file directories.
 /fileadmin/user_upload/
 /fileadmin/_temp_/
 /uploads/
 # Ignore cache
 /typo3conf/temp_CACHED*
 /typo3conf/temp_fieldInfo.php
 # Ignore local config which overrides typo3 config.
 # You should include your local stuff with `@include('localconf_local.php');` at the end of localconf.php.
 # See http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git for details.
 /typo3conf/localconf_local.php
 # Ignore system folders, you should have them symlinked.
 # If not comment out the following two entries.
-/typo3/
-/t3lib/
+/typo3
+/t3lib
 # Ignore temp directory.
 /typo3temp/
diff --git a/Unity.gitignore b/Unity.gitignore
index 6425e29..682085a 100644
--- a/Unity.gitignore
+++ b/Unity.gitignore
@@ -1,8 +1,10 @@
 [Ll]ibrary/
 [Tt]emp/
 [Oo]bj/
 
 # Autogenerated VS/MD solution and project files
-*.csproj
-*.unityproj
-*.sln
+/*.csproj
+/*.unityproj
+/*.sln
+/*.suo
+/*.user
diff --git a/VVVV.gitignore b/VVVV.gitignore
new file mode 100644
index 0000000..55a6a4b
--- /dev/null
+++ b/VVVV.gitignore
@@ -0,0 +1,7 @@
+
+# .v4p backup files
+*~.xml
+
+# Dynamic plugins .dll
+bin/
+
diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore
index 9945616..c273fc5 100644
--- a/VisualStudio.gitignore
+++ b/VisualStudio.gitignore
@@ -1,148 +1,180 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
 # User-specific files
 *.suo
 *.user
 *.sln.docstates
 
 # Build results
-
 [Dd]ebug/
+[Dd]ebugPublic/
 [Rr]elease/
 x64/
 build/
+bld/
 [Bb]in/
 [Oo]bj/
 
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
 *_i.c
 *_p.c
+*_i.h
 *.ilk
 *.meta
 *.obj
 *.pch
 *.pdb
 *.pgc
 *.pgd
 *.rsp
 *.sbr
 *.tlb
 *.tli
 *.tlh
 *.tmp
 *.tmp_proj
 *.log
 *.vspscc
 *.vssscc
 .builds
 *.pidb
-*.log
+*.svclog
 *.scc
 
+# Chutzpah Test files
+_Chutzpah*
+
 # Visual C++ cache files
 ipch/
 *.aps
 *.ncb
 *.opensdf
 *.sdf
 *.cachefile
 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
 
+# TFS 2012 Local Workspace
+$tf/
+
 # Guidance Automation Toolkit
 *.gpState
 
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
 
 # TeamCity is a build add-in
 _TeamCity*
 
 # DotCover is a Code Coverage Tool
 *.dotCover
 
 # NCrunch
 *.ncrunch*
+_NCrunch_*
 .*crunch*.local.xml
 
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
 # Installshield output folder
 [Ee]xpress/
 
 # DocProject is a documentation generator add-in
 DocProject/buildhelp/
 DocProject/Help/*.HxT
 DocProject/Help/*.HxC
 DocProject/Help/*.hhc
 DocProject/Help/*.hhk
 DocProject/Help/*.hhp
 DocProject/Help/Html2
 DocProject/Help/html
 
 # Click-Once directory
 publish/
 
 # Publish Web Output
 *.Publish.xml
-*.pubxml
+*.azurePubxml
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 #packages/
+## TODO: If the tool you use requires repositories.config, also uncomment the next line
+#!packages/repositories.config
 
 # Windows Azure Build Output
-csx
+csx/
 *.build.csdef
 
 # Windows Store app package directory
 AppPackages/
 
 # Others
 sql/
 *.Cache
 ClientBin/
 [Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
+*.dbproj.schemaview
 *.[Pp]ublish.xml
 *.pfx
 *.publishsettings
 
 # RIA/Silverlight projects
 Generated_Code/
 
 # Backup & report files from converting an old project file to a newer
 # Visual Studio version. Backup files are not needed, because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 
 # SQL Server files
 App_Data/*.mdf
 App_Data/*.ldf
 
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
 # =========================
 # Windows detritus
 # =========================
 
 # Windows image file caches
 Thumbs.db
 ehthumbs.db
 
 # Folder config file
 Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
diff --git a/WordPress.gitignore b/WordPress.gitignore
index 6ff1e08..8e22e0e 100644
--- a/WordPress.gitignore
+++ b/WordPress.gitignore
@@ -1,13 +1,12 @@
 .htaccess
-wp-config.php
 wp-content/uploads/
 wp-content/blogs.dir/
 wp-content/upgrade/
 wp-content/backup-db/
 wp-content/advanced-cache.php
 wp-content/wp-cache-config.php
 sitemap.xml
 *.log
 wp-content/cache/
 wp-content/backups/
-sitemap.xml.gz
\ No newline at end of file
+sitemap.xml.gz
diff --git a/Yii.gitignore b/Yii.gitignore
index 45a9a93..70f0875 100644
--- a/Yii.gitignore
+++ b/Yii.gitignore
@@ -1,3 +1,6 @@
-assets/
-protected/runtime/
-themes/classic/views/
\ No newline at end of file
+assets/*
+!assets/.gitignore
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/
diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore
index 0b8e595..014f93f 100644
--- a/ZendFramework.gitignore
+++ b/ZendFramework.gitignore
@@ -1,6 +1,5 @@
 INSTALL.txt
 LICENSE.txt
 README.txt
 demos/
 extras/documentation
-
diff --git a/nanoc.gitignore b/nanoc.gitignore
index ddc964b..4a2728c 100644
--- a/nanoc.gitignore
+++ b/nanoc.gitignore
@@ -1,7 +1,10 @@
 # For projects using nanoc (http://nanoc.stoneship.org/)
 
 # Default location for output, needs to match output_dir's value found in config.yaml
 output/
 
 # Temporary file directory
 tmp/
+
+# Crash Log
+crash.log