change EyeHistory save so that it checks for dups and deletes them, merging times together
fix format
add python humanize time that mimics moment.js
fix bugs
add a setup_django file for scripts folder. import this in first line of any script in this folder so it can run from the shell
script to backpopulate so that near duplicate histories are merged together
Merge remote-tracking branch 'origin/master' into 6-remove-dup-urls

Conflicts:
	api/models.py
fix bugs