Whatever "worked" on saturday 2/16. With a loose definition of "work"
Merge branch 'master' of github.com:anidev/612-2013