flickrCollect with config file
Merge branch 'master' of https://github.com/really-lazy-bone/beautiful-data

Conflicts:
	downloadflickr.py