missing file and merged docs Make

.coveragerc

-[run]
-omit =
-    # omit the following files. E.g. uncomment the next line
-    # tfields/plotting/*.py

docs/Makefile

 # Minimal makefile for Sphinx documentation
 #
-<<<<<<< HEAD
-=======
 MODULE_PATH := $(shell cd ..; pwd)
 MODULE := $(shell basename "$(MODULE_PATH)")
->>>>>>> cookiecutter-template
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
@@ -17,12 +14,9 @@ BUILDDIR      = _build
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-<<<<<<< HEAD
-=======
 apidocs: $(MODULEPATH)/$(MODULE)/*.py apidoc-templates/*
 	 sphinx-apidoc -o source/ ../$(MODULE)
 
->>>>>>> cookiecutter-template
 .PHONY: help Makefile
 
 # Catch-all target: route all unknown targets to Sphinx using the new