Change dump file name format, Marked 2 support

Merged changes to icloudtabs-dump.py