Lots of updates to get things working.
Removed unnecessary import.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	requirements.txt