updated collect command
Merge branch 'master' of github.com:mitnk/ingress

Conflicts:
	ingress/settings.py
updated min timestamp calculation