Merge branch '3.0'

Conflicts:
	.gitignore
	README.md
	bower.json
	dist/picturefill.js
	dist/picturefill.min.js
	examples/demo-01.html
	examples/demo-04.html
	gruntfile.js
	index.html
	package.json
	picturefill.json
	src/picturefill.js
	tests/tests.js

.gitignore

@@ -1,9 +1,24 @@
 .DS_Store
-.project
-node_modules
-**/.sass-cache
-**/.sass-cache/*
-*.bak
-*.zip
-.grunt
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
 
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+*.bak
+node_modules
+*.zip

.jscsrc

@@ -6,7 +6,7 @@
 	"excludeFiles": [
 		"node_modules",
 		"dist",
-		"tests/resources",
-		"src/external"
+		"tests",
+		"examples"
 	]
 }

README.md

@@ -1,18 +1,18 @@
 # Picturefill
 A [responsive image](http://www.whatwg.org/specs/web-apps/current-work/multipage/embedded-content.html#embedded-content) polyfill.
-* Authors: Scott Jehl, Mat Marquis, Shawn Jansepar (2.0 refactor lead), and many more: see Authors.txt
+* Authors: See [Authors.txt](https://github.com/scottjehl/picturefill/blob/3.0/Authors.txt)
 * License: MIT
 
 [![build-status](https://api.travis-ci.org/scottjehl/picturefill.svg)](https://travis-ci.org/scottjehl/picturefill) [<img src="https://pf-slackin.herokuapp.com/badge.svg" alt="Join Slack channel">](https://pf-slackin.herokuapp.com/)
 
 Picturefill has three versions:
-* Version 2 (recommended) is a strict polyfill of the [Picture element draft specification](http://www.whatwg.org/specs/web-apps/current-work/multipage/embedded-content.html#embedded-content) and is the main version in development.
-* Version 1 mimics the Picture element pattern with `span` elements. It is maintained in the 1.2 branch.
 
-## Usage, Demos, Docs
-To find out how to use Picturefill on your sites, visit the project and demo site:
+* Version 1 mimics the Picture element pattern with `span` elements. It is no longer maintained.
+* Version 2 is a lightweight polyfill of the [Picture element draft specification](http://www.whatwg.org/specs/web-apps/current-work/multipage/embedded-content.html#embedded-content).
+* Version 3.0.0 is the current stable release.
 
-[Picturefill Documentation, Downloads, and Demos Site](http://scottjehl.github.com/picturefill/)
+## Usage, Demos, Docs
+To find out how to use Picturefill, visit the [project site](http://scottjehl.github.com/picturefill/).
 
 ## The gotchas
 Be it browsers, the `picture` spec, or picturefill, there are a couple gotchas you should be aware of when working with Picturefill.
@@ -50,5 +50,4 @@ If you find a bug in Picturefill, please add it to [the issue tracker](https://g
 Picturefill discussion takes place via Slack. For an invitation, visit [https://pf-slackin.herokuapp.com/](https://pf-slackin.herokuapp.com/)
 
 ## Support
-
-Picturefill supports a broad range of browsers and devices (there are currently no known unsupported browsers), provided that you stick with the markup conventions provided.
+There are currently no known unsupported browsers, provided that you use the markup patterns provided.

bower.json

@@ -1,33 +1,33 @@
 {
-  "name": "picturefill",
-  "repo": "scottjehl/picturefill",
-  "description": "A Polyfill for the HTML Picture Element (http://picture.responsiveimages.org/) that you can use today.",
-  "version": "2.3.1",
-  "main": "dist/picturefill.js",
-  "scripts": [
-    "dist/picturefill.js"
-  ],
-  "license": "MIT",
-  "homepage": "http://scottjehl.github.com/picturefill/",
-  "authors": [
-    "Scott Jehl <[email protected]>"
-  ],
-  "moduleType": [
-    "amd",
-    "globals",
-    "node"
-  ],
-  "keywords": [
-    "picture",
-    "srcset",
-    "polyfill"
-  ],
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests",
-    "examples"
-  ]
-}
+	"name": "picturefill",
+	"repo": "scottjehl/picturefill",
+	"description": "A Polyfill for the HTML Picture Element (http://picture.responsiveimages.org/) that you can use today.",
+	"main": "dist/picturefill.js",
+	"scripts": [
+		"dist/picturefill.js"
+	],
+	"license": "MIT",
+	"homepage": "http://scottjehl.github.com/picturefill/",
+	"authors": [
+		"Scott Jehl <[email protected]>"
+	],
+	"moduleType": [
+		"amd",
+		"globals",
+		"node"
+	],
+	"keywords": [
+		"picture",
+		"srcset",
+		"polyfill"
+	],
+	"ignore": [
+		"**/.*",
+		"node_modules",
+		"bower_components",
+		"test",
+		"tests",
+		"examples",
+		"perf-test"
+	]
+}

composer.json

@@ -0,0 +1,18 @@
+{
+  "name": "scottjehl/picturefill",
+  "description": "A responsive image polyfill for <picture>, srcset, sizes, and more.",
+  "type": "component",
+  "homepage": "http://scottjehl.github.com/picturefill/",
+  "license": "MIT",
+  "extra": {
+    "component": {
+      "scripts": [
+        "dist/picturefill.js"
+      ],
+      "files": [
+        "dist/picturefill.min.js",
+        "extensions/ie8-mq-shim.js"
+      ]
+    }
+  }
+}