Merge branch 'feature/jaswsinc' into 000000-dev

Author: raamdev

.floo

@@ -22,6 +22,7 @@
 # Server config files.
 *.admins text
 *.cfg text
+*.cnf text
 *.conf text
 *.htaccess text
 *.htaccess-apache text
@@ -31,8 +32,14 @@
 # CSS/JavaScript files.
 *.css text
 *.js text
+*.css.map text
+*.js.map text
 *.json text
 
+# Applescript files.
+*.applescript text
+*.scpt binary
+
 # PHP scripts/files.
 *.inc text
 *.php text
@@ -140,4 +147,4 @@
 *.dll binary
 *.exe binary
 *.sh text
-*.so binary
+*.so binary

.flooignore

@@ -8,9 +8,15 @@
 *~
 *.bak
 
+# Node
+node_modules/
+npm-debug.log
+
+# SASS
+.sass-cache/
+
 # IntelliJ
 .idea/
-*.iml
 *.ipr
 *.iws
 
@@ -49,10 +55,13 @@ Icon?
 # Amazon Web Services
 .elasticbeanstalk/
 
-# For shell glob patterns. This includes GIT files too. We simply maintain this list together with `.gitignore`.
-# .~*;*~;*.bak;.idea;*.iml;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;.gitignore;.gitattributes;CVS;.cvsignore;.svn;_svn;.bzr;.bzrignore;.hg;.hgignore;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;.elasticbeanstalk
+# Vagrant
+.vagrant/
+
+# For shell glob patterns. This includes Git files too. We simply maintain this list together with `.gitignore`.
+# .~*;*~;*.bak;node_modules;npm-debug.log;.idea;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;.gitignore;.gitattributes;CVS;.cvsignore;.svn;_svn;.bzr;.bzrignore;.hg;.hgignore;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;._*;.elasticbeanstalk;.vagrant
 
 # This list is for IntelliJ IDEA / PhpStorm `File Types` configuration. Some files we actually WANT to work with as part of a project.
-# .idea;*.iml;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;CVS;.svn;_svn;.bzr;.hg;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;._*
+# .sass-cache;.idea;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;CVS;.svn;_svn;.bzr;.hg;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;._*;.vagrant
 
-# We also need to update the WebSharks™ Core `dirs_files::ignore()` method if this changes.
+# We also need to update the WebSharks™ Core `dirs_files::ignore()` method if this changes.

.gitattributes

@@ -1,7 +1,3 @@
 ## WordPress® Redirects
 
 Redirects (a new Post Type) for WordPress®.
-
----
-
-This project is now on Floobits too! [Watch us code](https://floobits.com/jaswsinc/wp-redirects/redirect) in real-time :-) <a href="https://floobits.com/jaswsinc/wp-redirects/redirect"><img alt="Floobits status" width="100" height="40" src="https://floobits.com/jaswsinc/wp-redirects.png" align="right" /></a>