Refactor of netflix ingest code
Merge branch 'master' into mbst-3744-netflix-ingest

Conflicts:
	src/main/java/org/atlasapi/remotesite/netflix/NetflixContentExtractor.java
Merge pull request #217 from atlasapi/mbst-3744-netflix-ingest

Refactor of netflix ingest code