Merge branch 'master' of github.com:will-hart/demarcate.js