Add ability to rename .nfo file to .nfo-orig
Merge branch 'develop' into nfo-orig
Merge pull request #1797 from Begall/nfo-orig

Add ability to rename .nfo file to .nfo-orig
Merge branch 'develop' into autopep8

Conflicts:
	headphones/__init__.py
	headphones/postprocessor.py