We've reached 1.0, I think. I'd like to add folders but I really need to... not code this for a day or two.
Merge branch 'master' into gh-pages