typo
Merge branch 'master' of github.com:daureg/illalla
try to link twitter places and 4SQ venues
pass city as a command line argument
Merge branch 'master' of github.com:daureg/illalla

Conflicts:
	gen_status.py
output categories distribution
Merge 'time pattern' with '2 level paris and barcelona cat'

Conflicts:
	explore.py