Updated documentation
Updated tests to right format, use dashes, & test for nils
Pull file/line inclusion out of conditionals, prefer dashes to underscores, little cleanup