ADD: optionality for second marker function

This is ready for review. This adds some the option to average a second marker file. I also removed a redundant test and did some pep8 to the module.