Working on lazy-src demo.
Cleaning up some code.
Merge branch 'master' into gh-pages