Merge branch 'master' of https://github.com/httpsters/jittery-joes
CONFLICTS ARRRGh