Tests and functional additions from master

Same as https://github.com/iFixit/node-markup/pull/15, for iFixit-production.