PEP8-ify flickrripper.py

Change-Id: Id33fac7d3bf4a309875e32e745632c49174d1cab
Simplify logic

Change-Id: I6df49a96da63d193422b906de17ed804046aa89e
Merge changes I6df49a96,Id33fac7d

* changes:
  Simplify logic
  PEP8-ify flickrripper.py