Merge tests and functional additions from master

There are various tests and functions added to node-markup that are useful but not yet in ifixit-production. Merge master (and perform iFixit-specific tweaks) to add these in.