Naming conventions
Merge branch 'refactor' of github.com:tangentmonger/twitterknitter into refactor