Refactor; things are working
Fixed style
Add unit test linting; add coverage
Refactored merge; added istanbul ignore coverage comments
Added functionality to use options through fixture filenames