Minor cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	__pycache__/get_id.cpython-34.pyc
	__pycache__/get_new_video.cpython-34.pyc
	__pycache__/rotate_background.cpython-34.pyc
Removed several advanced options since it makes the script slow, and they will probably not be used anyway.
removed cache
Merge pull request #11 from johanasplund/master

Removed several advanced options since it makes the script slow, and …