diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..d55cd2aa
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,py,html}]
+indent_style = space
+indent_size = 4
+charset = utf-8
+
+[Makefile]
+indent_style = tab
diff --git a/pandora/annotation/admin.py b/pandora/annotation/admin.py
index 56f9d041..663a1396 100644
--- a/pandora/annotation/admin.py
+++ b/pandora/annotation/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib import admin
diff --git a/pandora/annotation/management/commands/import_srt.py b/pandora/annotation/management/commands/import_srt.py
index 43f90747..011591c6 100644
--- a/pandora/annotation/management/commands/import_srt.py
+++ b/pandora/annotation/management/commands/import_srt.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/annotation/managers.py b/pandora/annotation/managers.py
index df3faaba..a0c32c04 100644
--- a/pandora/annotation/managers.py
+++ b/pandora/annotation/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from six import string_types
diff --git a/pandora/annotation/models.py b/pandora/annotation/models.py
index 6568c31d..2f7b7844 100644
--- a/pandora/annotation/models.py
+++ b/pandora/annotation/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import re
diff --git a/pandora/annotation/tasks.py b/pandora/annotation/tasks.py
index 514ba964..180198d3 100644
--- a/pandora/annotation/tasks.py
+++ b/pandora/annotation/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import ox
diff --git a/pandora/annotation/utils.py b/pandora/annotation/utils.py
index 5d48fc87..7be01743 100644
--- a/pandora/annotation/utils.py
+++ b/pandora/annotation/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# ci:si:et:sw=4:sts=4:ts=4
 import ox
 
 def cleanup_value(value, layer_type):
diff --git a/pandora/annotation/views.py b/pandora/annotation/views.py
index d57a20cc..ffafb531 100644
--- a/pandora/annotation/views.py
+++ b/pandora/annotation/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.conf import settings
diff --git a/pandora/app/admin.py b/pandora/app/admin.py
index 35509146..0394dbc9 100644
--- a/pandora/app/admin.py
+++ b/pandora/app/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib import admin
diff --git a/pandora/app/config.py b/pandora/app/config.py
index cb269515..f559aabf 100644
--- a/pandora/app/config.py
+++ b/pandora/app/config.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/app/documentation.py b/pandora/app/documentation.py
index fc13f143..2cba4e64 100644
--- a/pandora/app/documentation.py
+++ b/pandora/app/documentation.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 import re
diff --git a/pandora/app/management/commands/init_db.py b/pandora/app/management/commands/init_db.py
index 31519145..e4378cf3 100644
--- a/pandora/app/management/commands/init_db.py
+++ b/pandora/app/management/commands/init_db.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/app/management/commands/south_installed.py b/pandora/app/management/commands/south_installed.py
index b62d6edd..e753dbdf 100644
--- a/pandora/app/management/commands/south_installed.py
+++ b/pandora/app/management/commands/south_installed.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/app/management/commands/update_config_documentation.py b/pandora/app/management/commands/update_config_documentation.py
index 97281524..de7c7332 100644
--- a/pandora/app/management/commands/update_config_documentation.py
+++ b/pandora/app/management/commands/update_config_documentation.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 from django.core.management.base import BaseCommand
 from django.conf import settings
diff --git a/pandora/app/management/commands/update_geoip.py b/pandora/app/management/commands/update_geoip.py
index 6b771e6a..8fee7a12 100644
--- a/pandora/app/management/commands/update_geoip.py
+++ b/pandora/app/management/commands/update_geoip.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.core.management.base import BaseCommand
 
 from ... import config
diff --git a/pandora/app/management/commands/update_static.py b/pandora/app/management/commands/update_static.py
index 8769b0a3..3ebf7296 100644
--- a/pandora/app/management/commands/update_static.py
+++ b/pandora/app/management/commands/update_static.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.core.management.base import BaseCommand
 
 from ... import config
diff --git a/pandora/app/models.py b/pandora/app/models.py
index 7b5470b2..c7232863 100644
--- a/pandora/app/models.py
+++ b/pandora/app/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import json
diff --git a/pandora/app/monkey_patch.py b/pandora/app/monkey_patch.py
index f5864774..08065973 100644
--- a/pandora/app/monkey_patch.py
+++ b/pandora/app/monkey_patch.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib.auth.models import User, Group
diff --git a/pandora/app/tasks.py b/pandora/app/tasks.py
index ef7f6da9..c380f1e8 100644
--- a/pandora/app/tasks.py
+++ b/pandora/app/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import datetime
diff --git a/pandora/app/utils.py b/pandora/app/utils.py
index 7afabe85..f272e6c8 100644
--- a/pandora/app/utils.py
+++ b/pandora/app/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, with_statement
 
 import time
diff --git a/pandora/app/views.py b/pandora/app/views.py
index 12108903..25aae394 100644
--- a/pandora/app/views.py
+++ b/pandora/app/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import copy
diff --git a/pandora/archive/admin.py b/pandora/archive/admin.py
index 4e02e6a3..bf10ba42 100644
--- a/pandora/archive/admin.py
+++ b/pandora/archive/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib import admin
diff --git a/pandora/archive/chunk.py b/pandora/archive/chunk.py
index 56afe808..148ba24f 100644
--- a/pandora/archive/chunk.py
+++ b/pandora/archive/chunk.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, with_statement
 
 import os
diff --git a/pandora/archive/external.py b/pandora/archive/external.py
index b3bfce7e..4555f53f 100644
--- a/pandora/archive/external.py
+++ b/pandora/archive/external.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import json
diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py
index 9c9ce894..448e52e3 100644
--- a/pandora/archive/extract.py
+++ b/pandora/archive/extract.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/archive/management/commands/continue_encoding.py b/pandora/archive/management/commands/continue_encoding.py
index 61bf2317..beaced4d 100644
--- a/pandora/archive/management/commands/continue_encoding.py
+++ b/pandora/archive/management/commands/continue_encoding.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.core.management.base import BaseCommand
 
diff --git a/pandora/archive/management/commands/extract_derivatives.py b/pandora/archive/management/commands/extract_derivatives.py
index c859492f..c706e122 100644
--- a/pandora/archive/management/commands/extract_derivatives.py
+++ b/pandora/archive/management/commands/extract_derivatives.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.core.management.base import BaseCommand
 
diff --git a/pandora/archive/management/commands/import_streams.py b/pandora/archive/management/commands/import_streams.py
index bbc823a5..4d0d18f3 100644
--- a/pandora/archive/management/commands/import_streams.py
+++ b/pandora/archive/management/commands/import_streams.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/archive/management/commands/migrate_timelines.py b/pandora/archive/management/commands/migrate_timelines.py
index d1fa9b4e..9d9e5e59 100644
--- a/pandora/archive/management/commands/migrate_timelines.py
+++ b/pandora/archive/management/commands/migrate_timelines.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 import os
diff --git a/pandora/archive/management/commands/orphaned_media.py b/pandora/archive/management/commands/orphaned_media.py
index df4fcaf4..a6e831ab 100644
--- a/pandora/archive/management/commands/orphaned_media.py
+++ b/pandora/archive/management/commands/orphaned_media.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/archive/managers.py b/pandora/archive/managers.py
index 343675ea..eba14343 100644
--- a/pandora/archive/managers.py
+++ b/pandora/archive/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.db.models import Q, Manager
 
diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index 601eb602..a406d4a4 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import json
diff --git a/pandora/archive/queue.py b/pandora/archive/queue.py
index 0f64d0b1..6b917c20 100644
--- a/pandora/archive/queue.py
+++ b/pandora/archive/queue.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function
 
 from datetime import datetime
diff --git a/pandora/archive/tasks.py b/pandora/archive/tasks.py
index aeabaa24..b490ee18 100644
--- a/pandora/archive/tasks.py
+++ b/pandora/archive/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from glob import glob
diff --git a/pandora/archive/views.py b/pandora/archive/views.py
index 357824ae..3112d193 100644
--- a/pandora/archive/views.py
+++ b/pandora/archive/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os.path
diff --git a/pandora/changelog/managers.py b/pandora/changelog/managers.py
index b995b49d..f53cbb02 100644
--- a/pandora/changelog/managers.py
+++ b/pandora/changelog/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from oxdjango.query import QuerySet
 
diff --git a/pandora/changelog/models.py b/pandora/changelog/models.py
index 112b7351..1df9d728 100644
--- a/pandora/changelog/models.py
+++ b/pandora/changelog/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from datetime import datetime
diff --git a/pandora/changelog/views.py b/pandora/changelog/views.py
index 2f5b8178..677653b4 100644
--- a/pandora/changelog/views.py
+++ b/pandora/changelog/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import ox
diff --git a/pandora/clip/managers.py b/pandora/clip/managers.py
index d27cddb3..e1fa7591 100644
--- a/pandora/clip/managers.py
+++ b/pandora/clip/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from six import string_types
diff --git a/pandora/clip/models.py b/pandora/clip/models.py
index 99c0415c..121040fc 100644
--- a/pandora/clip/models.py
+++ b/pandora/clip/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db import models
diff --git a/pandora/clip/views.py b/pandora/clip/views.py
index 9b818c5b..dd5297cf 100644
--- a/pandora/clip/views.py
+++ b/pandora/clip/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.conf import settings
diff --git a/pandora/document/management/commands/rebuild_documentfind.py b/pandora/document/management/commands/rebuild_documentfind.py
index d297a566..d374ffaf 100644
--- a/pandora/document/management/commands/rebuild_documentfind.py
+++ b/pandora/document/management/commands/rebuild_documentfind.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/document/management/commands/sync_documentsort.py b/pandora/document/management/commands/sync_documentsort.py
index 43fc22b3..0bdb9909 100644
--- a/pandora/document/management/commands/sync_documentsort.py
+++ b/pandora/document/management/commands/sync_documentsort.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/document/managers.py b/pandora/document/managers.py
index db7ce3bf..c4af8be6 100644
--- a/pandora/document/managers.py
+++ b/pandora/document/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from six import string_types
diff --git a/pandora/document/models.py b/pandora/document/models.py
index f4bb480f..8b8b8cff 100644
--- a/pandora/document/models.py
+++ b/pandora/document/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/document/sync_sort.py b/pandora/document/sync_sort.py
index 211fc588..4fe44881 100644
--- a/pandora/document/sync_sort.py
+++ b/pandora/document/sync_sort.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/document/utils.py b/pandora/document/utils.py
index 70eb3da4..ee28ff53 100644
--- a/pandora/document/utils.py
+++ b/pandora/document/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import re
 import subprocess
 
diff --git a/pandora/document/views.py b/pandora/document/views.py
index a7ab0576..63ef06a2 100644
--- a/pandora/document/views.py
+++ b/pandora/document/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/documentcollection/managers.py b/pandora/documentcollection/managers.py
index 4439546c..30ead9f0 100644
--- a/pandora/documentcollection/managers.py
+++ b/pandora/documentcollection/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.db.models import Q, Manager
 
diff --git a/pandora/documentcollection/models.py b/pandora/documentcollection/models.py
index ff08a971..3026cb7f 100644
--- a/pandora/documentcollection/models.py
+++ b/pandora/documentcollection/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/documentcollection/views.py b/pandora/documentcollection/views.py
index 9140a108..170168de 100644
--- a/pandora/documentcollection/views.py
+++ b/pandora/documentcollection/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/edit/managers.py b/pandora/edit/managers.py
index 83a05b21..1bfaea00 100644
--- a/pandora/edit/managers.py
+++ b/pandora/edit/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 
 from oxdjango.query import QuerySet
diff --git a/pandora/edit/models.py b/pandora/edit/models.py
index 343b3d22..28ef5da5 100644
--- a/pandora/edit/models.py
+++ b/pandora/edit/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import re
diff --git a/pandora/edit/views.py b/pandora/edit/views.py
index 63fc492b..12d623c0 100644
--- a/pandora/edit/views.py
+++ b/pandora/edit/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/entity/managers.py b/pandora/entity/managers.py
index 7ea6133c..04981336 100644
--- a/pandora/entity/managers.py
+++ b/pandora/entity/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 
 import ox
diff --git a/pandora/entity/models.py b/pandora/entity/models.py
index 73db13f3..ad2a5fff 100644
--- a/pandora/entity/models.py
+++ b/pandora/entity/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/entity/views.py b/pandora/entity/views.py
index 035ce621..2d562a89 100644
--- a/pandora/entity/views.py
+++ b/pandora/entity/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from six import string_types
diff --git a/pandora/event/admin.py b/pandora/event/admin.py
index 9e1141ae..51597291 100644
--- a/pandora/event/admin.py
+++ b/pandora/event/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib import admin
diff --git a/pandora/event/managers.py b/pandora/event/managers.py
index dae9675b..8dcec385 100644
--- a/pandora/event/managers.py
+++ b/pandora/event/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from six import string_types
diff --git a/pandora/event/models.py b/pandora/event/models.py
index 0fbb7aac..01ac66dc 100644
--- a/pandora/event/models.py
+++ b/pandora/event/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db import models, transaction
diff --git a/pandora/event/tasks.py b/pandora/event/tasks.py
index 4fe23f29..85f30dff 100644
--- a/pandora/event/tasks.py
+++ b/pandora/event/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from celery.task import task
diff --git a/pandora/event/views.py b/pandora/event/views.py
index adf9e758..47744fa5 100644
--- a/pandora/event/views.py
+++ b/pandora/event/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db.models import Count
diff --git a/pandora/home/models.py b/pandora/home/models.py
index 9d7033ee..2969816c 100644
--- a/pandora/home/models.py
+++ b/pandora/home/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from six import string_types
diff --git a/pandora/item/admin.py b/pandora/item/admin.py
index 4c7f73eb..5cfebaf2 100644
--- a/pandora/item/admin.py
+++ b/pandora/item/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib import admin
diff --git a/pandora/item/data_api.py b/pandora/item/data_api.py
index 1e28bdf0..81d9d72c 100644
--- a/pandora/item/data_api.py
+++ b/pandora/item/data_api.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, with_statement
 
 import ox
diff --git a/pandora/item/management/commands/get_frame.py b/pandora/item/management/commands/get_frame.py
index c1ee0bb4..94b601e1 100644
--- a/pandora/item/management/commands/get_frame.py
+++ b/pandora/item/management/commands/get_frame.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/item/management/commands/rebuild_filter.py b/pandora/item/management/commands/rebuild_filter.py
index b3438d30..2ff7e2df 100644
--- a/pandora/item/management/commands/rebuild_filter.py
+++ b/pandora/item/management/commands/rebuild_filter.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 
diff --git a/pandora/item/management/commands/rebuild_find.py b/pandora/item/management/commands/rebuild_find.py
index 0d6e04fc..e74e1afe 100644
--- a/pandora/item/management/commands/rebuild_find.py
+++ b/pandora/item/management/commands/rebuild_find.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/item/management/commands/rebuild_indexes.py b/pandora/item/management/commands/rebuild_indexes.py
index 0ef2bc67..be885e07 100644
--- a/pandora/item/management/commands/rebuild_indexes.py
+++ b/pandora/item/management/commands/rebuild_indexes.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/item/management/commands/rebuild_sort.py b/pandora/item/management/commands/rebuild_sort.py
index 378d061e..71a69986 100644
--- a/pandora/item/management/commands/rebuild_sort.py
+++ b/pandora/item/management/commands/rebuild_sort.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 
diff --git a/pandora/item/management/commands/rebuild_timelines.py b/pandora/item/management/commands/rebuild_timelines.py
index f0aad16a..d7c03355 100644
--- a/pandora/item/management/commands/rebuild_timelines.py
+++ b/pandora/item/management/commands/rebuild_timelines.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 import os
diff --git a/pandora/item/management/commands/rebuildcache.py b/pandora/item/management/commands/rebuildcache.py
index d87ecf64..a15c67d5 100644
--- a/pandora/item/management/commands/rebuildcache.py
+++ b/pandora/item/management/commands/rebuildcache.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 import time
diff --git a/pandora/item/management/commands/sqlfindindex.py b/pandora/item/management/commands/sqlfindindex.py
index 8eb8f229..bba3a247 100644
--- a/pandora/item/management/commands/sqlfindindex.py
+++ b/pandora/item/management/commands/sqlfindindex.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 
diff --git a/pandora/item/management/commands/sync_itemsort.py b/pandora/item/management/commands/sync_itemsort.py
index 23b12520..d70889ac 100644
--- a/pandora/item/management/commands/sync_itemsort.py
+++ b/pandora/item/management/commands/sync_itemsort.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 from django.core.management.base import BaseCommand
diff --git a/pandora/item/management/commands/update_external.py b/pandora/item/management/commands/update_external.py
index 2577d584..aea8c530 100644
--- a/pandora/item/management/commands/update_external.py
+++ b/pandora/item/management/commands/update_external.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 
diff --git a/pandora/item/management/commands/update_itemsfolder.py b/pandora/item/management/commands/update_itemsfolder.py
index 6ed70605..38f0ea8d 100644
--- a/pandora/item/management/commands/update_itemsfolder.py
+++ b/pandora/item/management/commands/update_itemsfolder.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 
 import os
diff --git a/pandora/item/managers.py b/pandora/item/managers.py
index f4c29cce..a976719e 100644
--- a/pandora/item/managers.py
+++ b/pandora/item/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from datetime import datetime
diff --git a/pandora/item/models.py b/pandora/item/models.py
index 4032aed4..0897f5bd 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import json
diff --git a/pandora/item/tasks.py b/pandora/item/tasks.py
index c65bf2d4..0bda0651 100644
--- a/pandora/item/tasks.py
+++ b/pandora/item/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/item/timelines.py b/pandora/item/timelines.py
index 2e103737..87fe741c 100644
--- a/pandora/item/timelines.py
+++ b/pandora/item/timelines.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, with_statement, print_function
 
 import math
diff --git a/pandora/item/urls.py b/pandora/item/urls.py
index 98dc5c3b..948a1878 100644
--- a/pandora/item/urls.py
+++ b/pandora/item/urls.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.conf.urls import url
 
diff --git a/pandora/item/utils.py b/pandora/item/utils.py
index c6b6cfa4..38ca83ff 100644
--- a/pandora/item/utils.py
+++ b/pandora/item/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 #
 from decimal import Decimal
 import re
diff --git a/pandora/item/views.py b/pandora/item/views.py
index e00e75ed..07d9f4b8 100644
--- a/pandora/item/views.py
+++ b/pandora/item/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os.path
diff --git a/pandora/itemlist/managers.py b/pandora/itemlist/managers.py
index 267a20e9..989c8704 100644
--- a/pandora/itemlist/managers.py
+++ b/pandora/itemlist/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.db.models import Q, Manager
 
diff --git a/pandora/itemlist/models.py b/pandora/itemlist/models.py
index ad6f0bcf..29de3632 100644
--- a/pandora/itemlist/models.py
+++ b/pandora/itemlist/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/itemlist/views.py b/pandora/itemlist/views.py
index 649d70f7..067b7d51 100644
--- a/pandora/itemlist/views.py
+++ b/pandora/itemlist/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/log/managers.py b/pandora/log/managers.py
index 78c2f76e..6ee2b68d 100644
--- a/pandora/log/managers.py
+++ b/pandora/log/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 
 from oxdjango.query import QuerySet
diff --git a/pandora/log/models.py b/pandora/log/models.py
index a67700de..e730947d 100644
--- a/pandora/log/models.py
+++ b/pandora/log/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db import models
diff --git a/pandora/log/tasks.py b/pandora/log/tasks.py
index 1d7becda..ffb9f567 100644
--- a/pandora/log/tasks.py
+++ b/pandora/log/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from datetime import timedelta, datetime
diff --git a/pandora/log/utils.py b/pandora/log/utils.py
index 42dcbd17..df115303 100644
--- a/pandora/log/utils.py
+++ b/pandora/log/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import logging
diff --git a/pandora/log/views.py b/pandora/log/views.py
index 556cc62a..5016c406 100644
--- a/pandora/log/views.py
+++ b/pandora/log/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import ox
diff --git a/pandora/news/admin.py b/pandora/news/admin.py
index 97300b10..b7f636cb 100644
--- a/pandora/news/admin.py
+++ b/pandora/news/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib import admin
diff --git a/pandora/news/managers.py b/pandora/news/managers.py
index eff13876..bb1f242d 100644
--- a/pandora/news/managers.py
+++ b/pandora/news/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from oxdjango.query import QuerySet
 
diff --git a/pandora/news/models.py b/pandora/news/models.py
index 0f10e8e8..194a5ce7 100644
--- a/pandora/news/models.py
+++ b/pandora/news/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db import models
diff --git a/pandora/news/views.py b/pandora/news/views.py
index 4020ebc3..2a7fcf32 100644
--- a/pandora/news/views.py
+++ b/pandora/news/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import ox
diff --git a/pandora/oxdjango/api/actions.py b/pandora/oxdjango/api/actions.py
index 3f375598..f813e75a 100644
--- a/pandora/oxdjango/api/actions.py
+++ b/pandora/oxdjango/api/actions.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, absolute_import
 
 import inspect
diff --git a/pandora/oxdjango/api/urls.py b/pandora/oxdjango/api/urls.py
index 19eb11aa..159c4ff6 100644
--- a/pandora/oxdjango/api/urls.py
+++ b/pandora/oxdjango/api/urls.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import absolute_import
 
 from django.conf.urls import url
diff --git a/pandora/oxdjango/api/views.py b/pandora/oxdjango/api/views.py
index 92d4557c..f5886e84 100644
--- a/pandora/oxdjango/api/views.py
+++ b/pandora/oxdjango/api/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, absolute_import
 
 import json
diff --git a/pandora/oxdjango/decorators.py b/pandora/oxdjango/decorators.py
index 1feeee67..ab4fbf2d 100644
--- a/pandora/oxdjango/decorators.py
+++ b/pandora/oxdjango/decorators.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import absolute_import
 
 from functools import wraps
diff --git a/pandora/oxdjango/fields.py b/pandora/oxdjango/fields.py
index fdb5722d..fcb749bb 100644
--- a/pandora/oxdjango/fields.py
+++ b/pandora/oxdjango/fields.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import time
 import datetime
 import copy
diff --git a/pandora/oxdjango/http.py b/pandora/oxdjango/http.py
index 7a69dce6..9bd252d2 100644
--- a/pandora/oxdjango/http.py
+++ b/pandora/oxdjango/http.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import os
 import mimetypes
 from datetime import datetime, timedelta
diff --git a/pandora/oxdjango/middleware.py b/pandora/oxdjango/middleware.py
index 0eccf475..4883f23a 100644
--- a/pandora/oxdjango/middleware.py
+++ b/pandora/oxdjango/middleware.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from .shortcuts import HttpErrorJson, render_to_json_response
 
diff --git a/pandora/oxdjango/query.py b/pandora/oxdjango/query.py
index 5a7e43de..46500717 100644
--- a/pandora/oxdjango/query.py
+++ b/pandora/oxdjango/query.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.db.models.sql import Query
 from django.db.models.sql.compiler import SQLCompiler
diff --git a/pandora/oxdjango/shortcuts.py b/pandora/oxdjango/shortcuts.py
index ff0de756..f2a98662 100644
--- a/pandora/oxdjango/shortcuts.py
+++ b/pandora/oxdjango/shortcuts.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import print_function
 import datetime
 from django.utils import datetime_safe
diff --git a/pandora/person/managers.py b/pandora/person/managers.py
index c8b9dd49..4c718e6f 100644
--- a/pandora/person/managers.py
+++ b/pandora/person/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from six import string_types
diff --git a/pandora/person/models.py b/pandora/person/models.py
index 18f86584..a98bd68b 100644
--- a/pandora/person/models.py
+++ b/pandora/person/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import unicodedata
diff --git a/pandora/person/tasks.py b/pandora/person/tasks.py
index 9e9eb257..2f360dae 100644
--- a/pandora/person/tasks.py
+++ b/pandora/person/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from celery.task import task
diff --git a/pandora/person/views.py b/pandora/person/views.py
index 09cece95..aa6f6570 100644
--- a/pandora/person/views.py
+++ b/pandora/person/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import ox
diff --git a/pandora/place/admin.py b/pandora/place/admin.py
index 3a793633..209244d3 100644
--- a/pandora/place/admin.py
+++ b/pandora/place/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.contrib import admin
diff --git a/pandora/place/managers.py b/pandora/place/managers.py
index 9b16efc6..ad824591 100644
--- a/pandora/place/managers.py
+++ b/pandora/place/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from six import string_types
diff --git a/pandora/place/models.py b/pandora/place/models.py
index 4b0eba28..f8cf3840 100644
--- a/pandora/place/models.py
+++ b/pandora/place/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db import models, transaction
diff --git a/pandora/place/tasks.py b/pandora/place/tasks.py
index bb1aaa10..ba6b8375 100644
--- a/pandora/place/tasks.py
+++ b/pandora/place/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from celery.task import task
diff --git a/pandora/place/views.py b/pandora/place/views.py
index 43ec4829..9b9ba72f 100644
--- a/pandora/place/views.py
+++ b/pandora/place/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db.models import Max, Min, Count
diff --git a/pandora/sequence/extract.py b/pandora/sequence/extract.py
index 0a27ccd6..5cbcda50 100644
--- a/pandora/sequence/extract.py
+++ b/pandora/sequence/extract.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 import os
 
diff --git a/pandora/sequence/managers.py b/pandora/sequence/managers.py
index f1f049f2..63bf693b 100644
--- a/pandora/sequence/managers.py
+++ b/pandora/sequence/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db.models import Q, Manager
diff --git a/pandora/sequence/models.py b/pandora/sequence/models.py
index a3e6cb36..9abc6846 100644
--- a/pandora/sequence/models.py
+++ b/pandora/sequence/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from django.db import models
diff --git a/pandora/sequence/tasks.py b/pandora/sequence/tasks.py
index 283828d8..1282a66e 100644
--- a/pandora/sequence/tasks.py
+++ b/pandora/sequence/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from six import string_types
diff --git a/pandora/sequence/views.py b/pandora/sequence/views.py
index 67a438de..89986129 100644
--- a/pandora/sequence/views.py
+++ b/pandora/sequence/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from ox.utils import json
diff --git a/pandora/settings.py b/pandora/settings.py
index ed5c649d..b007d0ca 100644
--- a/pandora/settings.py
+++ b/pandora/settings.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 # Django settings for pan.do/ra project defaults,
 # create local_settings.py to overwrite
 # check pan.do/ra section below for relevant settings
diff --git a/pandora/taskqueue/models.py b/pandora/taskqueue/models.py
index e506f62f..ea85fcc2 100644
--- a/pandora/taskqueue/models.py
+++ b/pandora/taskqueue/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from datetime import datetime, timedelta
diff --git a/pandora/taskqueue/views.py b/pandora/taskqueue/views.py
index 49c2ef9c..e4791768 100644
--- a/pandora/taskqueue/views.py
+++ b/pandora/taskqueue/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import ox
diff --git a/pandora/text/managers.py b/pandora/text/managers.py
index 37b30d48..9de4ce65 100644
--- a/pandora/text/managers.py
+++ b/pandora/text/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 
 from oxdjango.managers import get_operator
diff --git a/pandora/text/models.py b/pandora/text/models.py
index e16d4f5d..d2451a19 100644
--- a/pandora/text/models.py
+++ b/pandora/text/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/text/views.py b/pandora/text/views.py
index 50aa802e..ecea30c8 100644
--- a/pandora/text/views.py
+++ b/pandora/text/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import os
diff --git a/pandora/title/managers.py b/pandora/title/managers.py
index f2f2629d..b70703a6 100644
--- a/pandora/title/managers.py
+++ b/pandora/title/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from six import string_types
diff --git a/pandora/title/models.py b/pandora/title/models.py
index 53157d7e..11c12339 100644
--- a/pandora/title/models.py
+++ b/pandora/title/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import unicodedata
diff --git a/pandora/title/views.py b/pandora/title/views.py
index 5eddf871..178cb74d 100644
--- a/pandora/title/views.py
+++ b/pandora/title/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import unicodedata
diff --git a/pandora/tv/models.py b/pandora/tv/models.py
index 26599ddd..3669df7b 100644
--- a/pandora/tv/models.py
+++ b/pandora/tv/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from datetime import datetime, timedelta
diff --git a/pandora/tv/tasks.py b/pandora/tv/tasks.py
index 61e8e122..80d36fbc 100644
--- a/pandora/tv/tasks.py
+++ b/pandora/tv/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from datetime import datetime, timedelta
diff --git a/pandora/tv/views.py b/pandora/tv/views.py
index d906187e..fedf8c7b 100644
--- a/pandora/tv/views.py
+++ b/pandora/tv/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 from ox.utils import json
diff --git a/pandora/urlalias/views.py b/pandora/urlalias/views.py
index 1919512b..8994837d 100644
--- a/pandora/urlalias/views.py
+++ b/pandora/urlalias/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import re
diff --git a/pandora/urls.py b/pandora/urls.py
index ee4042bb..faa446eb 100644
--- a/pandora/urls.py
+++ b/pandora/urls.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import os
 
 from django.conf.urls import url, include
diff --git a/pandora/user/decorators.py b/pandora/user/decorators.py
index e5e3029e..f53a7b1f 100644
--- a/pandora/user/decorators.py
+++ b/pandora/user/decorators.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 try:
     from django.contrib.auth.decorators import wraps
 except:
diff --git a/pandora/user/management/commands/update_useragents.py b/pandora/user/management/commands/update_useragents.py
index 389d28ee..d32fc115 100644
--- a/pandora/user/management/commands/update_useragents.py
+++ b/pandora/user/management/commands/update_useragents.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.core.management.base import BaseCommand
 
diff --git a/pandora/user/managers.py b/pandora/user/managers.py
index 3e7b9cae..6ae72991 100644
--- a/pandora/user/managers.py
+++ b/pandora/user/managers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from django.conf import settings
 
diff --git a/pandora/user/middleware.py b/pandora/user/middleware.py
index fc4da9b3..8c1c35d6 100644
--- a/pandora/user/middleware.py
+++ b/pandora/user/middleware.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from django.conf import settings
 from django.contrib.sessions.models import Session
 
diff --git a/pandora/user/models.py b/pandora/user/models.py
index a62ffbd5..6c7208eb 100644
--- a/pandora/user/models.py
+++ b/pandora/user/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import copy
diff --git a/pandora/user/statistics.py b/pandora/user/statistics.py
index c39388f2..0d60ba67 100644
--- a/pandora/user/statistics.py
+++ b/pandora/user/statistics.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import ox.geo
 
 import logging
diff --git a/pandora/user/tasks.py b/pandora/user/tasks.py
index 30482864..f54eb190 100644
--- a/pandora/user/tasks.py
+++ b/pandora/user/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import json
diff --git a/pandora/user/urls.py b/pandora/user/urls.py
index 58661933..429e1da9 100644
--- a/pandora/user/urls.py
+++ b/pandora/user/urls.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from django.conf.urls.defaults import *
 
diff --git a/pandora/user/views.py b/pandora/user/views.py
index 182a602b..89edcdcf 100644
--- a/pandora/user/views.py
+++ b/pandora/user/views.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, print_function, absolute_import
 
 import random
diff --git a/pandora/websocket/__init__.py b/pandora/websocket/__init__.py
index 805c41a8..e012f868 100644
--- a/pandora/websocket/__init__.py
+++ b/pandora/websocket/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from celery.execute import send_task
 from django.conf import settings
diff --git a/pandora/websocket/daemon.py b/pandora/websocket/daemon.py
index 46160dbd..43e4fdd5 100644
--- a/pandora/websocket/daemon.py
+++ b/pandora/websocket/daemon.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import json
 from threading import Thread
diff --git a/pandora/websocket/management/commands/websocketd.py b/pandora/websocket/management/commands/websocketd.py
index 45ab6bea..0eb9ed25 100644
--- a/pandora/websocket/management/commands/websocketd.py
+++ b/pandora/websocket/management/commands/websocketd.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import absolute_import
 
 import os
diff --git a/pandora/websocket/worker.py b/pandora/websocket/worker.py
index 2a1d3bf7..afe0634c 100644
--- a/pandora/websocket/worker.py
+++ b/pandora/websocket/worker.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import absolute_import
 
 from django.conf import settings
diff --git a/scripts/item_icon.pandora.py b/scripts/item_icon.pandora.py
index 3eb62e63..4f4b1e35 100755
--- a/scripts/item_icon.pandora.py
+++ b/scripts/item_icon.pandora.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import os
 import sys
 
diff --git a/scripts/list_icon.pandora.py b/scripts/list_icon.pandora.py
index 873dc2e5..8c930b7d 100755
--- a/scripts/list_icon.pandora.py
+++ b/scripts/list_icon.pandora.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import os
 import sys
 
diff --git a/scripts/poster.0xdb.py b/scripts/poster.0xdb.py
index f040c6ed..928d5e0d 100755
--- a/scripts/poster.0xdb.py
+++ b/scripts/poster.0xdb.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 import os
 
diff --git a/scripts/poster.indiancinema.py b/scripts/poster.indiancinema.py
index 40d61b38..392fb50b 100755
--- a/scripts/poster.indiancinema.py
+++ b/scripts/poster.indiancinema.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 import os
 
diff --git a/scripts/poster.padma.py b/scripts/poster.padma.py
index a9372462..81ec3dfe 100755
--- a/scripts/poster.padma.py
+++ b/scripts/poster.padma.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 import os
 
diff --git a/scripts/poster.pandora.py b/scripts/poster.pandora.py
index 1524bc72..fa34e09e 100755
--- a/scripts/poster.pandora.py
+++ b/scripts/poster.pandora.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 import os
 
diff --git a/static/js/UI.js b/static/js/UI.js
index d4294283..149a0e81 100644
--- a/static/js/UI.js
+++ b/static/js/UI.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.UI = (function() {
diff --git a/static/js/URL.js b/static/js/URL.js
index c6d274b1..f31f6f15 100644
--- a/static/js/URL.js
+++ b/static/js/URL.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.URL = (function() {
diff --git a/static/js/account.js b/static/js/account.js
index cf87afcc..e213330f 100644
--- a/static/js/account.js
+++ b/static/js/account.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.accountDialog = function(action) {
diff --git a/static/js/annotationDialog.js b/static/js/annotationDialog.js
index cdede80f..ae2aa8dc 100644
--- a/static/js/annotationDialog.js
+++ b/static/js/annotationDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.annotationDialog = function(layer) {
diff --git a/static/js/apiDialog.js b/static/js/apiDialog.js
index 1d25436a..21f6690d 100644
--- a/static/js/apiDialog.js
+++ b/static/js/apiDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.apiDialog = function() {
diff --git a/static/js/appPanel.js b/static/js/appPanel.js
index 82a1a816..5ca52e00 100644
--- a/static/js/appPanel.js
+++ b/static/js/appPanel.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.appPanel = function() {
diff --git a/static/js/autovalidate.js b/static/js/autovalidate.js
index c20b012d..90a5959a 100644
--- a/static/js/autovalidate.js
+++ b/static/js/autovalidate.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.autovalidateCode = function(value, blur, callback) {
diff --git a/static/js/backButton.js b/static/js/backButton.js
index b98781b8..e1f33d24 100644
--- a/static/js/backButton.js
+++ b/static/js/backButton.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.backButton = function() {
     var that = Ox.Button({
         title: Ox._('Back to {0}', [
diff --git a/static/js/browser.js b/static/js/browser.js
index f36fed67..323011d0 100644
--- a/static/js/browser.js
+++ b/static/js/browser.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.browser = function() {
     var that;
     if (!pandora.user.ui.item) {
diff --git a/static/js/changelogDialog.js b/static/js/changelogDialog.js
index 5cf54358..5dfaea02 100644
--- a/static/js/changelogDialog.js
+++ b/static/js/changelogDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.changelogDialog = function() {
diff --git a/static/js/chunkupload.js b/static/js/chunkupload.js
index 90b7135e..c8a4cb27 100644
--- a/static/js/chunkupload.js
+++ b/static/js/chunkupload.js
@@ -1,4 +1,3 @@
-// vi:si:et:sw=4:sts=4:ts=4
 // GPL2+/MIT 2012
 'use strict';
 /*
diff --git a/static/js/clipList.js b/static/js/clipList.js
index 260d2576..e0c5ae8e 100644
--- a/static/js/clipList.js
+++ b/static/js/clipList.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.clipList = function(videoRatio) {
diff --git a/static/js/clipsView.js b/static/js/clipsView.js
index 3d5b56f7..43a1cd53 100644
--- a/static/js/clipsView.js
+++ b/static/js/clipsView.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.clipsView = function(videoRatio) {
diff --git a/static/js/collection.js b/static/js/collection.js
index 0a64032d..60185906 100644
--- a/static/js/collection.js
+++ b/static/js/collection.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 
diff --git a/static/js/contactForm.js b/static/js/contactForm.js
index 4f77ce4e..23b4cd28 100644
--- a/static/js/contactForm.js
+++ b/static/js/contactForm.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.contactForm = function() {
diff --git a/static/js/contentPanel.js b/static/js/contentPanel.js
index cbb012d9..7dae0d84 100644
--- a/static/js/contentPanel.js
+++ b/static/js/contentPanel.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.contentPanel = function() {
     var that = Ox.SplitPanel({
             elements: !pandora.user.ui.item ? [
diff --git a/static/js/deleteDocumentDialog.js b/static/js/deleteDocumentDialog.js
index f8dd62e6..05d8f55e 100644
--- a/static/js/deleteDocumentDialog.js
+++ b/static/js/deleteDocumentDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.deleteDocumentDialog = function(files, callback) {
diff --git a/static/js/deleteEntityDialog.js b/static/js/deleteEntityDialog.js
index f7aceac4..01317803 100644
--- a/static/js/deleteEntityDialog.js
+++ b/static/js/deleteEntityDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.deleteEntityDialog = function(entities, callback) {
diff --git a/static/js/deleteItemsDialog.js b/static/js/deleteItemsDialog.js
index 9283fc1f..2961a633 100644
--- a/static/js/deleteItemsDialog.js
+++ b/static/js/deleteItemsDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.deleteItemsDialog = function(options) {
diff --git a/static/js/deleteListDialog.js b/static/js/deleteListDialog.js
index 1b9e6dc2..953b73c8 100644
--- a/static/js/deleteListDialog.js
+++ b/static/js/deleteListDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.deleteListDialog = function(list) {
diff --git a/static/js/document.js b/static/js/document.js
index da7dde7f..7f97eba9 100644
--- a/static/js/document.js
+++ b/static/js/document.js
@@ -1,5 +1,3 @@
-
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.document = function() {
diff --git a/static/js/documentBrowser.js b/static/js/documentBrowser.js
index 2cea0f05..3bcb2699 100644
--- a/static/js/documentBrowser.js
+++ b/static/js/documentBrowser.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.documentBrowser = function() {
     var that;
     if (!pandora.user.ui.document) {
diff --git a/static/js/documentContentPanel.js b/static/js/documentContentPanel.js
index 254809b8..6e5703de 100644
--- a/static/js/documentContentPanel.js
+++ b/static/js/documentContentPanel.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.documentContentPanel = function() {
diff --git a/static/js/documentDialog.js b/static/js/documentDialog.js
index e961544a..8afacc37 100644
--- a/static/js/documentDialog.js
+++ b/static/js/documentDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 // fixme: this is a very uncommon pattern
diff --git a/static/js/documentFilterForm.js b/static/js/documentFilterForm.js
index 3aae4296..2d0992a6 100644
--- a/static/js/documentFilterForm.js
+++ b/static/js/documentFilterForm.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.documentFilterForm = function(options) {
diff --git a/static/js/documentPanel.js b/static/js/documentPanel.js
index d04e9540..5dd9445f 100644
--- a/static/js/documentPanel.js
+++ b/static/js/documentPanel.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.documentPanel = function() {
diff --git a/static/js/documentToolbar.js b/static/js/documentToolbar.js
index 841ebbb5..347fc2df 100644
--- a/static/js/documentToolbar.js
+++ b/static/js/documentToolbar.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.documentToolbar = function() {
diff --git a/static/js/documentsDialog.js b/static/js/documentsDialog.js
index e6f2f862..385eb085 100644
--- a/static/js/documentsDialog.js
+++ b/static/js/documentsDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.documentsDialog = function() {
diff --git a/static/js/documentsPanel.js b/static/js/documentsPanel.js
index 9044307a..f0f03a9a 100644
--- a/static/js/documentsPanel.js
+++ b/static/js/documentsPanel.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.documentColumns = [
diff --git a/static/js/editor.js b/static/js/editor.js
index 16ff36da..9e9cb826 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.editor = function(data) {
diff --git a/static/js/embed/pandora.js b/static/js/embed/pandora.js
index ee225f3c..b0e2ccf9 100755
--- a/static/js/embed/pandora.js
+++ b/static/js/embed/pandora.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 Ox.load('UI', {
diff --git a/static/js/embedDocument.js b/static/js/embedDocument.js
index ac036975..027a508a 100644
--- a/static/js/embedDocument.js
+++ b/static/js/embedDocument.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.embedDocument = function() {
diff --git a/static/js/embedDocumentDialog.js b/static/js/embedDocumentDialog.js
index 15423a05..cda54933 100644
--- a/static/js/embedDocumentDialog.js
+++ b/static/js/embedDocumentDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.embedDocumentDialog = function(id, position) {
diff --git a/static/js/embedVideoDialog.js b/static/js/embedVideoDialog.js
index 530d38f0..ace63ed9 100644
--- a/static/js/embedVideoDialog.js
+++ b/static/js/embedVideoDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.embedVideoDialog = function() {
diff --git a/static/js/entitiesDialog.js b/static/js/entitiesDialog.js
index a5e61895..e67c49c5 100644
--- a/static/js/entitiesDialog.js
+++ b/static/js/entitiesDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.entitiesDialog = function(options) {
diff --git a/static/js/entity.js b/static/js/entity.js
index a3806f20..5eba6e1b 100644
--- a/static/js/entity.js
+++ b/static/js/entity.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.entity = function(options, callback) {
diff --git a/static/js/entityDialog.js b/static/js/entityDialog.js
index fcd19b1a..fa390027 100644
--- a/static/js/entityDialog.js
+++ b/static/js/entityDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.entityDialog = function() {
diff --git a/static/js/errorDialog.js b/static/js/errorDialog.js
index af909477..d27c86f1 100644
--- a/static/js/errorDialog.js
+++ b/static/js/errorDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.errorDialog = function(data) {
diff --git a/static/js/errorlogsDialog.js b/static/js/errorlogsDialog.js
index f551bbf6..a4529ae4 100644
--- a/static/js/errorlogsDialog.js
+++ b/static/js/errorlogsDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.errorlogsDialog = function() {
diff --git a/static/js/eventsDialog.js b/static/js/eventsDialog.js
index 466044a4..bba1eabd 100644
--- a/static/js/eventsDialog.js
+++ b/static/js/eventsDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.eventsDialog = function(options) {
diff --git a/static/js/filter.js b/static/js/filter.js
index 82ca951e..0999c890 100644
--- a/static/js/filter.js
+++ b/static/js/filter.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.filter = function(id) {
     var i = Ox.getIndexById(pandora.user.ui.filters, id),
         filter = Ox.getObjectById(pandora.site.filters, id),
diff --git a/static/js/filterDialog.js b/static/js/filterDialog.js
index 78508713..88be1d55 100644
--- a/static/js/filterDialog.js
+++ b/static/js/filterDialog.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.filterDialog = function() {
 
     var that = Ox.Dialog({
diff --git a/static/js/filterForm.js b/static/js/filterForm.js
index c69a5669..7d145473 100644
--- a/static/js/filterForm.js
+++ b/static/js/filterForm.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.filterForm = function(options) {
diff --git a/static/js/findDocumentsElement.js b/static/js/findDocumentsElement.js
index be856bdc..e8fcfea7 100644
--- a/static/js/findDocumentsElement.js
+++ b/static/js/findDocumentsElement.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.findDocumentsElement = function() {
diff --git a/static/js/findElement.js b/static/js/findElement.js
index 37439534..43fa0e6e 100644
--- a/static/js/findElement.js
+++ b/static/js/findElement.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.findElement = function() {
     var findIndex = pandora.user.ui._findState.index,
         findKey = pandora.user.ui._findState.key,
diff --git a/static/js/folderBrowser.js b/static/js/folderBrowser.js
index 943077f5..8546c220 100644
--- a/static/js/folderBrowser.js
+++ b/static/js/folderBrowser.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.folderBrowser = function(id, section) {
     // Yes, we have to wait for the lists init event to decide if it is shown.
     // This run-once init handler runs *after* the list's own init handler.
diff --git a/static/js/folderBrowserBar.js b/static/js/folderBrowserBar.js
index 26cd5f55..38ec44e6 100644
--- a/static/js/folderBrowserBar.js
+++ b/static/js/folderBrowserBar.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.folderBrowserBar = function(id, section) {
     section = section || pandora.user.ui.section;
     var ui = pandora.user.ui,
diff --git a/static/js/folderBrowserList.js b/static/js/folderBrowserList.js
index 598cf8bc..c08c9355 100644
--- a/static/js/folderBrowserList.js
+++ b/static/js/folderBrowserList.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.folderBrowserList = function(id, section) {
     // fixme: user and name are set to the same width here,
     // but resizeFolders will set them to different widths
diff --git a/static/js/folderList.js b/static/js/folderList.js
index 1fcb9cc2..fa4bd717 100644
--- a/static/js/folderList.js
+++ b/static/js/folderList.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.folderList = function(id, section) {
diff --git a/static/js/folderPlaceholder.js b/static/js/folderPlaceholder.js
index c3a9bbc8..444c3289 100644
--- a/static/js/folderPlaceholder.js
+++ b/static/js/folderPlaceholder.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.folderPlaceholder = function(id, section) {
     var that = Ox.Element()
             .addClass('OxLight')
diff --git a/static/js/folders.js b/static/js/folders.js
index 3f9e776c..188f163e 100644
--- a/static/js/folders.js
+++ b/static/js/folders.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.folders = function(section) {
     section = section || pandora.user.ui.section;
     var ui = pandora.user.ui,
diff --git a/static/js/helpDialog.js b/static/js/helpDialog.js
index 6ea9eeea..53b2497f 100644
--- a/static/js/helpDialog.js
+++ b/static/js/helpDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.helpDialog = function() {
diff --git a/static/js/home.0xdb.js b/static/js/home.0xdb.js
index 0881e8d4..757eef21 100644
--- a/static/js/home.0xdb.js
+++ b/static/js/home.0xdb.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.home = function() {
diff --git a/static/js/home.indiancinema.js b/static/js/home.indiancinema.js
index a0ad48e2..8319329c 100644
--- a/static/js/home.indiancinema.js
+++ b/static/js/home.indiancinema.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.home = function() {
diff --git a/static/js/home.js b/static/js/home.js
index e03983ce..76162e7a 100644
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.home = function() {
diff --git a/static/js/home.padma.js b/static/js/home.padma.js
index f68a009f..b9e3edfe 100644
--- a/static/js/home.padma.js
+++ b/static/js/home.padma.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.home = function() {
diff --git a/static/js/importAnnotationsDialog.js b/static/js/importAnnotationsDialog.js
index 9ff12aca..7f2f6174 100644
--- a/static/js/importAnnotationsDialog.js
+++ b/static/js/importAnnotationsDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.importAnnotationsDialog = function(options) {
diff --git a/static/js/info.js b/static/js/info.js
index b8349e5a..38bcef79 100644
--- a/static/js/info.js
+++ b/static/js/info.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.info = function() {
 
     var ui = pandora.user.ui,
diff --git a/static/js/item.js b/static/js/item.js
index b4a6c346..91c9b8f4 100644
--- a/static/js/item.js
+++ b/static/js/item.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.item = function() {
diff --git a/static/js/leftPanel.js b/static/js/leftPanel.js
index 417e727b..88ded0ab 100644
--- a/static/js/leftPanel.js
+++ b/static/js/leftPanel.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.leftPanel = function(section) {
     var that = Ox.SplitPanel({
             elements: [
diff --git a/static/js/licenseDialog.js b/static/js/licenseDialog.js
index cb003158..ce4768cf 100644
--- a/static/js/licenseDialog.js
+++ b/static/js/licenseDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.licenseDialog = function() {
diff --git a/static/js/linkVideoDialog.js b/static/js/linkVideoDialog.js
index 7ca4f215..6f497f06 100644
--- a/static/js/linkVideoDialog.js
+++ b/static/js/linkVideoDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.linkVideoDialog = function() {
diff --git a/static/js/list.js b/static/js/list.js
index 14a414a3..09dfca44 100644
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.list = function() {
diff --git a/static/js/listDialog.js b/static/js/listDialog.js
index 7df404e5..41ba382d 100644
--- a/static/js/listDialog.js
+++ b/static/js/listDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.listDialog = function(section) {
diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js
index 293cbc14..bb3e0488 100644
--- a/static/js/mainMenu.js
+++ b/static/js/mainMenu.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.mainMenu = function() {
diff --git a/static/js/mainPanel.js b/static/js/mainPanel.js
index 333fe789..e94f700c 100644
--- a/static/js/mainPanel.js
+++ b/static/js/mainPanel.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.mainPanel = function() {
     var ui = pandora.user.ui,
         that = Ox.SplitPanel({
diff --git a/static/js/makeListPrivateDialog.js b/static/js/makeListPrivateDialog.js
index 366e4405..df3a8193 100644
--- a/static/js/makeListPrivateDialog.js
+++ b/static/js/makeListPrivateDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.makeListPrivateDialog = function(name, subscribers, callback) {
diff --git a/static/js/mediaView.js b/static/js/mediaView.js
index 8630dc34..1c425f76 100644
--- a/static/js/mediaView.js
+++ b/static/js/mediaView.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.mediaView = function(options) {
diff --git a/static/js/namesDialog.js b/static/js/namesDialog.js
index cd1d2273..6bbcfca6 100644
--- a/static/js/namesDialog.js
+++ b/static/js/namesDialog.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.namesDialog = function() {
 
     // FIXME: add cache invalidation
diff --git a/static/js/navigationView.js b/static/js/navigationView.js
index 9cd4d4fa..f035c003 100644
--- a/static/js/navigationView.js
+++ b/static/js/navigationView.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.navigationView = function(type, videoRatio) {
diff --git a/static/js/pandora.js b/static/js/pandora.js
index 1a405074..c238563f 100644
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 /*
diff --git a/static/js/placesDialog.js b/static/js/placesDialog.js
index b270803f..cb648c0a 100644
--- a/static/js/placesDialog.js
+++ b/static/js/placesDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.placesDialog = function(options) {
diff --git a/static/js/player.js b/static/js/player.js
index ee6dfef4..409f1821 100644
--- a/static/js/player.js
+++ b/static/js/player.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.player = function(data) {
diff --git a/static/js/printView.js b/static/js/printView.js
index a534903e..6b19130e 100644
--- a/static/js/printView.js
+++ b/static/js/printView.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.printView = function(data) {
@@ -120,4 +118,4 @@ pandora.ui.printView = function(data) {
 
     return that;
 
-};
\ No newline at end of file
+};
diff --git a/static/js/resetUIDialog.js b/static/js/resetUIDialog.js
index a31a4da7..8bc84d11 100644
--- a/static/js/resetUIDialog.js
+++ b/static/js/resetUIDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.resetUIDialog = function(data) {
diff --git a/static/js/rightPanel.js b/static/js/rightPanel.js
index 5d39d66b..6a8d497b 100644
--- a/static/js/rightPanel.js
+++ b/static/js/rightPanel.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.rightPanel = function() {
diff --git a/static/js/scriptDialog.js b/static/js/scriptDialog.js
index a7c59476..dc374f2a 100644
--- a/static/js/scriptDialog.js
+++ b/static/js/scriptDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.scriptDialog = function() {
diff --git a/static/js/sectionButtons.js b/static/js/sectionButtons.js
index 73ee40e0..cb0f6093 100644
--- a/static/js/sectionButtons.js
+++ b/static/js/sectionButtons.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.sectionButtons = function(section) {
     var that = Ox.ButtonGroup({
             buttons: [
diff --git a/static/js/sectionSelect.js b/static/js/sectionSelect.js
index 7018acfe..af05755f 100644
--- a/static/js/sectionSelect.js
+++ b/static/js/sectionSelect.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.sectionSelect = function(section) {
     // fixme: duplicated
     var that = Ox.Select({
diff --git a/static/js/sectionbar.js b/static/js/sectionbar.js
index 77a88061..b53e722f 100644
--- a/static/js/sectionbar.js
+++ b/static/js/sectionbar.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.sectionbar = function(mode, isDragAndDrop) {
     var that = Ox.Bar({
             size: 24
diff --git a/static/js/similarClipsDialog.js b/static/js/similarClipsDialog.js
index 1bb25139..8c352bc1 100644
--- a/static/js/similarClipsDialog.js
+++ b/static/js/similarClipsDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.similarClipsDialog = function() {
diff --git a/static/js/siteDialog.0xdb.js b/static/js/siteDialog.0xdb.js
index 102e3939..6707c9dd 100644
--- a/static/js/siteDialog.0xdb.js
+++ b/static/js/siteDialog.0xdb.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.siteDialog = function(section) {
diff --git a/static/js/siteDialog.js b/static/js/siteDialog.js
index cd29cf35..c9ba8bbc 100644
--- a/static/js/siteDialog.js
+++ b/static/js/siteDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.siteDialog = function(section) {
diff --git a/static/js/sortElement.js b/static/js/sortElement.js
index 5d336e00..7c19fa32 100644
--- a/static/js/sortElement.js
+++ b/static/js/sortElement.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.sortElement = function(isNavigationView) {
diff --git a/static/js/statisticsDialog.js b/static/js/statisticsDialog.js
index 2ca6b423..7ec46a99 100644
--- a/static/js/statisticsDialog.js
+++ b/static/js/statisticsDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.statisticsDialog = function() {
diff --git a/static/js/statusbar.js b/static/js/statusbar.js
index 72b40e82..1f4d7804 100644
--- a/static/js/statusbar.js
+++ b/static/js/statusbar.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.statusbar = function() {
diff --git a/static/js/tests.js b/static/js/tests.js
index b839af1b..f56d2f2a 100644
--- a/static/js/tests.js
+++ b/static/js/tests.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.tests = function() {
diff --git a/static/js/timeline.js b/static/js/timeline.js
index d806c46b..89d72d56 100644
--- a/static/js/timeline.js
+++ b/static/js/timeline.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.timeline = function(data) {
diff --git a/static/js/titlesDialog.js b/static/js/titlesDialog.js
index 82225cd7..5d16416b 100644
--- a/static/js/titlesDialog.js
+++ b/static/js/titlesDialog.js
@@ -1,5 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
+
 pandora.ui.titlesDialog = function() {
 
     var height = Math.round((window.innerHeight - 48) * 0.9),
diff --git a/static/js/toolbar.js b/static/js/toolbar.js
index ca74fb9f..464a7fc1 100644
--- a/static/js/toolbar.js
+++ b/static/js/toolbar.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.toolbar = function() {
diff --git a/static/js/tv.js b/static/js/tv.js
index bc8d5278..79b4eecf 100644
--- a/static/js/tv.js
+++ b/static/js/tv.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.tv = function() {
diff --git a/static/js/uploadDocumentDialog.js b/static/js/uploadDocumentDialog.js
index 42d698a5..b4da9c92 100644
--- a/static/js/uploadDocumentDialog.js
+++ b/static/js/uploadDocumentDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.uploadDocumentDialog = function(options, callback) {
diff --git a/static/js/uploadPDFDialog.js b/static/js/uploadPDFDialog.js
index 02120e9a..d07d2b62 100644
--- a/static/js/uploadPDFDialog.js
+++ b/static/js/uploadPDFDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.uploadPDFDialog = function(options) {
diff --git a/static/js/uploadVideoDialog.js b/static/js/uploadVideoDialog.js
index 157cda8d..cb455a67 100644
--- a/static/js/uploadVideoDialog.js
+++ b/static/js/uploadVideoDialog.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 pandora.ui.uploadVideoDialog = function(data) {
diff --git a/static/js/usersDialog.js b/static/js/usersDialog.js
index bf997c64..6faaf6e6 100644
--- a/static/js/usersDialog.js
+++ b/static/js/usersDialog.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.usersDialog = function() {
diff --git a/static/js/utils.js b/static/js/utils.js
index 19fce25a..22612883 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.addItem = function(title, callback) {
diff --git a/static/js/videoPreview.js b/static/js/videoPreview.js
index 2ae638c6..b35b6d36 100644
--- a/static/js/videoPreview.js
+++ b/static/js/videoPreview.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.videoPreview = function(data) {
diff --git a/static/js/videoView.js b/static/js/videoView.js
index 3165fadb..3a4780d0 100644
--- a/static/js/videoView.js
+++ b/static/js/videoView.js
@@ -1,4 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
 'use strict';
 
 // FIXME: remove!
diff --git a/static/js/viewSelect.js b/static/js/viewSelect.js
index b61acf74..9311e426 100644
--- a/static/js/viewSelect.js
+++ b/static/js/viewSelect.js
@@ -1,5 +1,3 @@
-// vim: et:ts=4:sw=4:sts=4:ft=javascript
-
 'use strict';
 
 pandora.ui.viewSelect = function() {