Moved blacklist file
Tidied up variable scoping
Fixed scope change missed earlier
Merge pull request #11 from faceleg/feature/tidy-loop

Feature/tidy loop
Merge pull request #12 from faceleg/feature/blacklist-improvements

Feature/blacklist improvements
Merge pull request #13 from faceleg/feature/caching

Feature/caching
Merged 'master'.