Merge pull request #1 from 14to9/master

September 2013 release
Merge branch 'master' into gh-pages
defaulting to black