2.5.4-dev

* Added normalize as a dependency
* Merged master into development

.gitignore

@@ -3,3 +3,4 @@
 skeleton.*
 skeleton_template.css
 *.html
+dependencies/

README.md

@@ -49,7 +49,7 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries (
 		* `_functions.scss` the default global functions for Skeleton Sass
 		* `_mixins.scss` the default global mixins for Skeleton Sass
 	* `themes` where all of the themes live
-		* `demo`
+		* `demo` & `fresh`
 			* `marrow` stores all project-level functions and mixins
 				* `_mixins.scss` loads the default theme mixins and functions from `sphenoid`
 			* `_base.scss` contains all of the base styles for Skeleton Sass with the exception of the reset styles
@@ -61,7 +61,6 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries (
 			* `_base.scss` contains all of the base styles for Skeleton Sass (same look as Skeleton CSS created)
 			* `_vars.scss` contains project-scoped configuration options
 			* `_skeleton.scss` contains all the styles to create the grid
-		* `fresh`
 * `_MYconfig.scss` contains all of your global configuration options that won't be overridden by an update to Skeleton Sass
 * `skeleton_template.scss` contains all of the styles accumulated into a single file.
 
@@ -70,12 +69,16 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries (
 
 Install Skeleton Sass with bower via command line:
 
-	bower install skeleton-sass
+~~~bash
+bower install skeleton-sass --save
+~~~
 
-You can also install alpha, beta, rc, and previous versions by looking at the [releases](https://github.com/atomicpages/skeleton-sass/releases) page and install with the following syntax:
+You can also install alpha, beta, release candidate, and previous versions by looking at the [releases](https://github.com/atomicpages/skeleton-sass/releases) page and install with the following syntax:
 
-	bower install skeleton-sass#[tag]
-	bower install skeleton-sass#2.0.0-b2
+~~~bash
+bower install skeleton-sass#[tag]
+bower install skeleton-sass#2.0.0-b2
+~~~
 
 [Learn how to set up Skeleton Sass for the first time here](https://github.com/atomicpages/skeleton-sass/wiki/Setting-up-Skeleton-Sass-for-first-time-use).
 
@@ -111,10 +114,16 @@ Skeleton Sass is community driven. We will gladly review any issues that you fin
 
 Changelog
 ---------
+### 2.5.4
+* Adding `normalize.scss` as a dependency
+* Merged master in development for version bump
+
 ### 2.5.3
-* Added some more HTML 5 form elements
-* Migrated normalize to a bower dependency so it can be maintained in a better way
-* Removed old version of normalize from mixin
+* Comment cleanup
+* Rearranging of dependencies
+* Update to year in license and other copyright headers
+* Change `Dir.exists?` to `Dir.exist?` to squash ruby 2.3.x deprecation notice
+* Manual bump to normalize.css 4.2.0
 
 ### 2.5.2
 * Fixes [issue #22](https://github.com/atomicpages/skeleton-sass/issues/22)

_MYconfig.scss

@@ -12,7 +12,7 @@
 //
 // HOW TO RUN AUTOMATED SETUP
 // 1. Open terminal and issue the following command:
-//    bin/setup.rb - Note: You must have ruby installed
+//    bin/setup.rb - Note: You must have ruby 2.x installed
 //	   to run this script
 // 2. Follow prompts from script
 

bin/theme_setup.rb

@@ -15,7 +15,7 @@
 name = Helper.nfqr("Please enter in the name of your theme with no spaces or special characters other than - or _ and press [ENTER]", /[^\w\-]/, "Theme name invalid, please try again and press [ENTER]")
 puts "Theme name is #{name}"
 
-if !Dir.exists?("skeleton/themes/#{name}")
+if !Dir.exist?("skeleton/themes/#{name}")
 	Dir.mkdir("skeleton/themes/#{name}")
 end
 
@@ -28,7 +28,7 @@
 file.puts("@import \"sphenoid/skeleton\"; // Override manually if you wish to create your own grid")
 puts "skeleton/themes/_loader.scss has been updated... moving on"
 
-if !Dir.exists?("skeleton/themes/#{name}/marrow")
+if !Dir.exist?("skeleton/themes/#{name}/marrow")
 	Dir.mkdir("skeleton/themes/#{name}/marrow")
 end
 

bin/update.rb

@@ -37,7 +37,7 @@
 	end
 end
 
-if File.exists?(".bower.json")
+if File.exist?(".bower.json")
 	resp = Helper.yesno("Bowers files found. Update with bower now? [y/n]")
 	if resp =~ /y(es)?/i
 		puts "Updating skeleton-sass"

bin/upgrade.rb

@@ -39,7 +39,7 @@ def nfqr(question, regex, errorMsg = "Invalid input. #{question}", isValid = nil
 	end
 
 	def cp(file, destination)
-		if !File.exists?(file) # fail quickly if not found
+		if !File.exist?(file) # fail quickly if not found
 			raise SystemCallError, "#{file} was not found or does not exist"
 		end
 
@@ -125,7 +125,7 @@ def gem_available?(name)
 	%x(ruby -i.bak -pe "gsub /#{key}/i, '#{value}'" #{filename})
 end
 
-if File.exists?("#{filename}.bak")
+if File.exist?("#{filename}.bak")
 	File.delete("#{filename}.bak")
 end
 

bower.json

@@ -1,9 +1,7 @@
 {
 	"name": "skeleton-sass",
-	"version": "2.5.3",
-	"authors": [
-		"Dennis Thompson <[email protected]>"
-	],
+	"version": "2.5.4",
+	"author": "Dennis Thompson",
 	"homepage": "http://atomicpages.github.io/skeleton-sass/",
 	"repository": {
 		"type": "git",
@@ -15,9 +13,7 @@
 			"url": "http://opensource.org/licenses/MIT"
 		}
 	],
-	"main": [
-		"skeleton_template.scss"
-	],
+	"main": ["skeleton_template.scss"],
 	"keywords": [
 		"sass",
 		"design",
@@ -33,6 +29,6 @@
 		"dependencies/"
 	],
 	"dependencies": {
-		"normalize-scss": "normalize.scss#^4.2.1"
+		"normalize.scss": "latest"
 	}
 }