Funnyface.js: Indentation
Some cleanup
Merge branch 'master' of github.com:addyosmani/todomvc

* 'master' of github.com:addyosmani/todomvc:
  Close GH-157: Updating Angular demo to v1.0 of the library.
  various readme changes. some minor, some necessary to move towards cleaner markdown
  very minor change for consistency in comment spacing/casing
  updating readme to include links, revised team notes and other tweaks
Batman.js: Replace lib with minified
Merge remote-tracking branch 'upstream/master'

Conflicts:
	todo-example/dojo/index.html
Close GH-165: Updated Knockback to 0.15.1 and Knockout to 2.1.0.
Close #163: PlastronJS app
Fixed crlf issue
PlastronJS: Convert to tabs
PlastronJS: Fix code style and readme
Close GH-122: Added a Stapes.js example.
Moving across to new template
Fixing inline edit styling
Spine: Fix todos not updating when checked while on a route
Spine: Minor cleanup
Close GH-169: inline makeEditable for PlastronJS.
jQuery: Use templating on the footer too
jQuery: Extract store() method to Utils
Move SammyJS to labs
SammyJS: Fix paths, minify js, correct folder structure.