Cleaned up a bit, no new functionality.
Merge branch 'master' of https://github.com/Prato/Textile