diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..22d6f3c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: php
+
+php:
+  - 5.2
+  - 5.3
+  #- 5.4
+
+env:
+  - OMEKA_BRANCH=stable-1.5
+  #- OMEKA_BRANCH=master
+
+before_script:
+  - ./travis_setup.sh
+
+script: ./travis_tests.sh
+
+notifications:
+  irc: "irc.freenode.org#slab"
diff --git a/.tx/config b/.tx/config
new file mode 100644
index 0000000..56149c0
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[neatline.neatline-maps]
+file_filter = languages/<lang>.po
+source_file = languages/template.pot
+source_lang = en
+
diff --git a/NeatlineMapsPlugin.php b/NeatlineMapsPlugin.php
index 7167ee1..8c19444 100644
--- a/NeatlineMapsPlugin.php
+++ b/NeatlineMapsPlugin.php
@@ -18,7 +18,9 @@ class NeatlineMapsPlugin
         'public_append_to_items_show',
         'before_delete_item',
         'public_theme_header',
-        'admin_theme_header'
+        'admin_theme_header',
+        'initialize',
+        'define_acl'
     );
 
     private static $_filters = array(
@@ -201,20 +203,41 @@ public function defineRoutes($router)
     public function afterSaveFormItem($item, $post)
     {
 
-        if (!isset($_FILES['file']) 
-            || count($_FILES['file']['size']) == 1
-            && empty($_FILES['file']['size'][0])
-        ) {
+        $hasTiff = false;
+        if (isset($_FILES['file'])) {
 
-                // Create/update/delete WMS.
-                $this->servicesTable->createOrUpdate(
-                    $item,
-                    $post['address'],
-                    $post['layers']
-                );
+            $fcount = count($_FILES['file']['name']);
+            for ($i=0; $i<$fcount; $i++) {
+                $hasTiff = $hasTiff ||
+                    (!empty($_FILES['file']['size'][$i]) &&
+                     $_FILES['file']['type'][$i] == 'image/tiff');
+            }
 
         }
 
+        if (!$hasTiff) {
+            $this->_createOrUpdateWMS($item, $post);
+        }
+
+    }
+
+
+    /**
+     * This creates or updates the WMS server on an item.
+     *
+     * @param Item  $item The item.
+     * @param array $post The complete $_POST.
+     *
+     * @return void
+     * @author Eric Rochester <erochest@virginia.edu>
+     **/
+    protected function _createOrUpdateWMS($item, $post)
+    {
+        $this->servicesTable->createOrUpdate(
+            $item,
+            $post['address'],
+            $post['layers']
+        );
     }
 
     /**
@@ -338,6 +361,47 @@ public function adminThemeHeader($request)
 
     }
 
+    /**
+     * Initialization.
+     *
+     * Adds translation source.
+     *
+     * @return void.
+     */
+    public function initialize()
+    {
+        add_translation_source(dirname(__FILE__) . '/languages');
+    }
+
+    /**
+     * Define the ACL
+     */
+    public function defineAcl($acl)
+    {
+        $resourceName = 'NeatlineMaps_Servers';
+
+        $resourceList = array(
+            $resourceName => array(
+                'add',
+                'browse',
+                'edit',
+                'delete',
+                'show',
+                'active'
+            )
+        );
+
+        if (!$acl->has($resourceName)) {
+            $acl->loadResourceList($resourceList);
+            foreach ($resourceList as $resource => $privileges) {
+                $acl->deny(null, $resource);
+                $acl->allow('super', $resource);
+                $acl->allow('admin', $resource);
+            }
+        }
+
+
+    }
 
     /**
      * Filter callbacks:
@@ -354,7 +418,10 @@ public function adminThemeHeader($request)
     public function adminNavigationMain($tabs)
     {
 
-        $tabs[__('Neatline Maps')] = uri('neatline-maps');
+        if (has_permission('NeatlineMaps_Servers', 'browse')) {
+            $tabs['Neatline Maps'] = uri('neatline-maps');
+        }
+
         return $tabs;
 
     }
diff --git a/README.md b/README.md
index ad9864d..c266242 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Neatline Maps
 
+[![Build Status](https://secure.travis-ci.org/scholarslab/NeatlineMaps.png)](http://travis-ci.org/scholarslab/NeatlineMaps)
+
 Working with geospatial data can be difficult. The NeatlineMaps plugin allows
 you to upload georeferenced maps to the popular open source
 [Geoserver][geoserver], allowing you not only to use your data easily in Omeka,
@@ -151,13 +153,38 @@ Neatline will automatically render the map on the exhibit. In this way, you can
 configure any combination of WMS maps in the exhibit by activating or
 deactivating the Omeka items associated with that exhibit.
 
+### Migrating Data to Another Server
+
+Often when developing a site, it's useful to be able to work on a separate
+server running GeoServer, whether on your laptop or on a staging site. You can
+easily migrate this information to your production server. GeoServer keeps all
+configuration and data in its [data directory][geoserver-data]. To find where
+this is, go into GeoServer and click the *Server Status* link at the top of the
+left column. The first item on the status page is the location of the data
+directory.
+
+![GeoServer Data Directory](http://neatline.org/wp-content/uploads/2012/08/geoserver-data-dir.png)
+
+Now after you install GeoServer on the final server, you can copy the data
+directory from the old server onto the new server and have access to your data.
+
 ## Support
 
 We use an [issue tracker][issues] for feedback on issues and requested
 improvements. If you have general questions, you may also post them to
 the [Omeka Forums][forums]  or the [Omeka Developers Group][groups].
 
+## Credits
+
+### Translations
+
+* Martin Liebeskind (German)
+* Gillian Price (Spanish)
+* Oguljan Reyimbaeva (Russian)
+* Katina Rogers (French)
+
 [geoserver]: http://geoserver.org
+[geoserver-data]: http://docs.geoserver.org/latest/en/user/datadirectory/index.html
 [neatline-maps-download]: http://neatline.scholarslab.org/plugins/neatline-maps
 [ogc]: http://www.opengeospatial.org/
 [gmaps]: http://maps.google.com/
diff --git a/controllers/ServersController.php b/controllers/ServersController.php
index cb6a8ea..96b8f7a 100644
--- a/controllers/ServersController.php
+++ b/controllers/ServersController.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Servers controller.
@@ -22,17 +22,19 @@ class NeatlineMaps_ServersController extends Omeka_Controller_Action
      */
     public function init()
     {
-        $this->serversTable = $this->getTable('NeatlineMapsServer');
-    }
 
-    /**
-     * Show servers.
-     *
-     * @return void
-     */
-    public function browseAction()
-    {
-        $this->view->servers = $this->serversTable->findAll();
+        $modelName = 'NeatlineMapsServer';
+        if (version_compare(OMEKA_VERSION, '2.0-dev', '>=')) {
+            $this->_helper->db->setDefaultModelName($modelName);
+        } else {
+            $this->_modelClass = $modelName;
+        }
+
+        try {
+            $this->_table = $this->getTable($modelName);
+            $this->aclResource = $this->findById();
+        } catch (Omeka_Controller_Exception_404 $e) {}
+
     }
 
     /**
@@ -57,7 +59,7 @@ public function addAction()
             if ($form->isValid($post)) {
 
                 // Create server.
-                $this->serversTable->updateServer($server, $post);
+                $this->_table->updateServer($server, $post);
 
                 // Redirect to browse.
                 $this->redirect->goto('browse');
@@ -85,9 +87,7 @@ public function editAction()
     {
 
         // Get server.
-        $server = $this->serversTable->find(
-            $this->_request->getParam('id')
-        );
+        $server = $this->findById();
 
         // Get form.
         $form = new ServerForm;
@@ -112,7 +112,7 @@ public function editAction()
             if ($form->isValid($post)) {
 
                 // Create server.
-                $this->serversTable->updateServer($server, $post);
+                $this->_table->updateServer($server, $post);
 
                 // Redirect to browse.
                 $this->redirect->goto('browse');
@@ -131,30 +131,6 @@ public function editAction()
 
     }
 
-    /**
-     * Delete server.
-     *
-     * @return void
-     */
-    public function deleteAction()
-    {
-
-        // Get server.
-        $server = $this->serversTable->find(
-            $this->_request->getParam('id')
-        );
-
-        // If a form as been posted.
-        if ($this->_request->isPost()) {
-            $server->delete();
-            $this->redirect->goto('browse');
-        }
-
-        // Push server to view.
-        $this->view->server = $server;
-
-    }
-
     /**
      * Set server active.
      *
@@ -164,9 +140,7 @@ public function activeAction()
     {
 
         // Get server.
-        $server = $this->serversTable->find(
-            $this->_request->getParam('id')
-        );
+        $server = $this->findById();
 
         // Set active and save.
         $server->active = 1;
@@ -177,4 +151,11 @@ public function activeAction()
 
     }
 
+    /**
+     * Sets the delete confirm message
+     */
+    protected function _getDeleteConfirmMessage($server)
+    {
+        return __('This will permanently delete the %s server.', $server->name);
+    }
 }
diff --git a/forms/ServerForm.php b/forms/ServerForm.php
index e43f8bf..f2505ec 100644
--- a/forms/ServerForm.php
+++ b/forms/ServerForm.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Server form.
diff --git a/forms/Validate/isUrl.php b/forms/Validate/isUrl.php
index 526ad41..7bcf1c0 100644
--- a/forms/Validate/isUrl.php
+++ b/forms/Validate/isUrl.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Copied with small modifications from https://github.com/rondobley/Zend-Framework-Validate-URL.
diff --git a/helpers/NeatlineMapsFunctions.php b/helpers/NeatlineMapsFunctions.php
index 892ad47..340bd70 100644
--- a/helpers/NeatlineMapsFunctions.php
+++ b/helpers/NeatlineMapsFunctions.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Helpers.
diff --git a/languages/de_DE.mo b/languages/de_DE.mo
new file mode 100644
index 0000000..6ce2475
Binary files /dev/null and b/languages/de_DE.mo differ
diff --git a/languages/de_DE.po b/languages/de_DE.po
new file mode 100644
index 0000000..a5a22b6
--- /dev/null
+++ b/languages/de_DE.po
@@ -0,0 +1,152 @@
+# Translation for the Neatline Time plugin for Omeka.
+# 
+# Translators:
+#   <martin.liebeskind@live.de>, 2012.
+# Martin Liebeskind <martin.liebeskind@live.de>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Neatline\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"POT-Creation-Date: 2012-06-22 11:30-0500\n"
+"PO-Revision-Date: 2012-08-28 18:57+0000\n"
+"Last-Translator: Martin Liebeskind <martin.liebeskind@live.de>\n"
+"Language-Team: German (Germany) (http://www.transifex.com/projects/p/neatline/language/de_DE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: NeatlineMapsPlugin.php:451
+msgid "Web Map Service"
+msgstr "Web Kartendienst"
+
+#: controllers/ServersController.php:159
+#, php-format
+msgid "This will permanently delete the %s server."
+msgstr "Dies löscht den %s Server unwiderruflich."
+
+#: forms/ServerForm.php:35
+msgid "An internal (non-public) identifier for the server."
+msgstr "Eine interne (nicht öffentliche) Kennung für den Server."
+
+#: forms/ServerForm.php:42
+msgid "Enter a name."
+msgstr "Bitte einen Namen eingeben."
+
+#: forms/ServerForm.php:51 views/admin/servers/browse.php:41
+msgid "URL"
+msgstr "URL"
+
+#: forms/ServerForm.php:52
+msgid "The location of the server."
+msgstr "Die Adresse des Servers."
+
+#: forms/ServerForm.php:59
+msgid "Enter a URL."
+msgstr "Bitte eine URL eingeben."
+
+#: forms/ServerForm.php:75 views/admin/servers/browse.php:42
+msgid "Workspace"
+msgstr "Arbeitsbereich"
+
+#: forms/ServerForm.php:76
+msgid "Enter the Geoserver workspace."
+msgstr "Bitte den Geoserver Arbeitsbereich eingeben."
+
+#: forms/ServerForm.php:83
+msgid "Enter a workspace."
+msgstr "Bitte einen Arbeitsbereich eingeben."
+
+#: forms/ServerForm.php:93
+msgid "Enter the Geoserver username."
+msgstr "Bitte den Benutzernamen des Geoservers eingeben."
+
+#: forms/ServerForm.php:100
+msgid "Enter a username."
+msgstr "Bitte einen Benutzernamen eingeben"
+
+#: forms/ServerForm.php:110
+msgid "Enter the Geoserver password."
+msgstr "Bitte das Passwort des Geoservers eingeben."
+
+#: forms/ServerForm.php:118
+msgid "Enter a password."
+msgstr "Bitte ein Passwort eingeben."
+
+#: forms/ServerForm.php:128
+msgid "Should this server be used to handle new GeoTiff uploads?"
+msgstr "Soll dieser Server zur Verwendung von GeoTiff-Uploads benutzt werden?"
+
+#: forms/ServerForm.php:134
+msgid "Save"
+msgstr "Speichern"
+
+#: models/NeatlineMapsServer.php:103
+msgid "Online"
+msgstr "Online"
+
+#: models/NeatlineMapsServer.php:104
+msgid "Offline"
+msgstr "Offline"
+
+#: models/NeatlineMapsServer.php:105
+msgid "Authentication Error"
+msgstr "Authentifizierungfehler"
+
+#: views/admin/items/_serviceForm.php:17
+msgid "WMS Address"
+msgstr "WMS Adresse"
+
+#: views/admin/items/_serviceForm.php:21
+msgid "Enter the WMS address of the map."
+msgstr "Bitte die WMS Adresse der Karte eingeben."
+
+#: views/admin/items/_serviceForm.php:25
+msgid "Layers"
+msgstr "Ebenen"
+
+#: views/admin/items/_serviceForm.php:29
+msgid "Enter a comma-delimited list of layers."
+msgstr "Bitte eine komma-separierte Liste von Ebenen eingeben."
+
+#: views/admin/servers/add.php:17
+msgid "Neatline Maps | Create Server"
+msgstr "Neatline Maps | Server erstellen"
+
+#: views/admin/servers/add.php:24 views/admin/servers/browse.php:25
+#: views/admin/servers/edit.php:24
+msgid "Create a Server"
+msgstr "Einen Server erstellen"
+
+#: views/admin/servers/browse.php:18
+msgid "Neatline Maps | Browse Servers"
+msgstr "Neatline Maps | Server durchsuchen"
+
+#: views/admin/servers/browse.php:40
+msgid "Server"
+msgstr "Server"
+
+#: views/admin/servers/browse.php:43
+msgid "Status"
+msgstr "Status"
+
+#: views/admin/servers/browse.php:45
+msgid "Actions"
+msgstr "Aktionen"
+
+#: views/admin/servers/browse.php:69
+msgid "Set Active"
+msgstr "Aktivieren"
+
+#: views/admin/servers/browse.php:85
+msgid "There are no servers yet."
+msgstr "Zurzeit sind keine Server konfiguriert."
+
+#: views/admin/servers/browse.php:86
+msgid "Create one!"
+msgstr "Erstelle einen!"
+
+#: views/admin/servers/edit.php:17
+msgid "Neatline Maps | Edit Server"
+msgstr "Neatline Maps | Server bearbeiten"
diff --git a/languages/es.mo b/languages/es.mo
new file mode 100644
index 0000000..70379f4
Binary files /dev/null and b/languages/es.mo differ
diff --git a/languages/es.po b/languages/es.po
new file mode 100644
index 0000000..4c372c5
--- /dev/null
+++ b/languages/es.po
@@ -0,0 +1,151 @@
+# Translation for the Neatline Time plugin for Omeka.
+# 
+# Translators:
+#   <gbp2q@virginia.edu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Neatline\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"POT-Creation-Date: 2012-06-22 11:30-0500\n"
+"PO-Revision-Date: 2012-08-20 17:13+0000\n"
+"Last-Translator: gbp2q <gbp2q@virginia.edu>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/neatline/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: NeatlineMapsPlugin.php:451
+msgid "Web Map Service"
+msgstr "Servicio de mapa del web."
+
+#: controllers/ServersController.php:159
+#, php-format
+msgid "This will permanently delete the %s server."
+msgstr "Esto borrará peramentemente el  %s  servidor."
+
+#: forms/ServerForm.php:35
+msgid "An internal (non-public) identifier for the server."
+msgstr "Un identificador interno (no público) para el servidor. "
+
+#: forms/ServerForm.php:42
+msgid "Enter a name."
+msgstr "Inscriba un nombre. "
+
+#: forms/ServerForm.php:51 views/admin/servers/browse.php:41
+msgid "URL"
+msgstr "URL"
+
+#: forms/ServerForm.php:52
+msgid "The location of the server."
+msgstr "La locación del servidor."
+
+#: forms/ServerForm.php:59
+msgid "Enter a URL."
+msgstr "Inscriba un URL."
+
+#: forms/ServerForm.php:75 views/admin/servers/browse.php:42
+msgid "Workspace"
+msgstr "Espacio de trabajo."
+
+#: forms/ServerForm.php:76
+msgid "Enter the Geoserver workspace."
+msgstr "Inscriba el espacio de trabajo para el Geoserver."
+
+#: forms/ServerForm.php:83
+msgid "Enter a workspace."
+msgstr "Inscriba un espacio de trabajo. "
+
+#: forms/ServerForm.php:93
+msgid "Enter the Geoserver username."
+msgstr "Inscriba un nombre de usuario para el Geoserver. "
+
+#: forms/ServerForm.php:100
+msgid "Enter a username."
+msgstr "Inscriba un nombre de usuario. "
+
+#: forms/ServerForm.php:110
+msgid "Enter the Geoserver password."
+msgstr "Inscriba la contraseña para el Geoserver."
+
+#: forms/ServerForm.php:118
+msgid "Enter a password."
+msgstr "Inscriba una contraseña. "
+
+#: forms/ServerForm.php:128
+msgid "Should this server be used to handle new GeoTiff uploads?"
+msgstr "¿Se debe usar este servidor para nuevos cargos de GeoTiff?"
+
+#: forms/ServerForm.php:134
+msgid "Save"
+msgstr "Guardar."
+
+#: models/NeatlineMapsServer.php:103
+msgid "Online"
+msgstr "Conectado"
+
+#: models/NeatlineMapsServer.php:104
+msgid "Offline"
+msgstr "Desconectado"
+
+#: models/NeatlineMapsServer.php:105
+msgid "Authentication Error"
+msgstr "Error autenticación"
+
+#: views/admin/items/_serviceForm.php:17
+msgid "WMS Address"
+msgstr "Dirección del WMS."
+
+#: views/admin/items/_serviceForm.php:21
+msgid "Enter the WMS address of the map."
+msgstr "Inscriba la dirección del WMS del mapa. "
+
+#: views/admin/items/_serviceForm.php:25
+msgid "Layers"
+msgstr "Capas."
+
+#: views/admin/items/_serviceForm.php:29
+msgid "Enter a comma-delimited list of layers."
+msgstr "Inscriba una lista de capas que sean delimitados por comas."
+
+#: views/admin/servers/add.php:17
+msgid "Neatline Maps | Create Server"
+msgstr "Mapas de Neatline | Crear servidor"
+
+#: views/admin/servers/add.php:24 views/admin/servers/browse.php:25
+#: views/admin/servers/edit.php:24
+msgid "Create a Server"
+msgstr "Crear servidor."
+
+#: views/admin/servers/browse.php:18
+msgid "Neatline Maps | Browse Servers"
+msgstr "Mapas de Neatline | Explorar servidores"
+
+#: views/admin/servers/browse.php:40
+msgid "Server"
+msgstr "Servidor"
+
+#: views/admin/servers/browse.php:43
+msgid "Status"
+msgstr "Estatus"
+
+#: views/admin/servers/browse.php:45
+msgid "Actions"
+msgstr "Acciones"
+
+#: views/admin/servers/browse.php:69
+msgid "Set Active"
+msgstr "Poner activo"
+
+#: views/admin/servers/browse.php:85
+msgid "There are no servers yet."
+msgstr "No hay servidores todavía."
+
+#: views/admin/servers/browse.php:86
+msgid "Create one!"
+msgstr "¡Crear uno!"
+
+#: views/admin/servers/edit.php:17
+msgid "Neatline Maps | Edit Server"
+msgstr "Mapas de Neatline | Editar servidor "
diff --git a/languages/fr.mo b/languages/fr.mo
new file mode 100644
index 0000000..300dbf1
Binary files /dev/null and b/languages/fr.mo differ
diff --git a/languages/fr.po b/languages/fr.po
new file mode 100644
index 0000000..23bbcd1
--- /dev/null
+++ b/languages/fr.po
@@ -0,0 +1,152 @@
+# Translation for the Neatline Time plugin for Omeka.
+# 
+# Translators:
+# Jeremy Boggs <jeremy@clioweb.org>, 2012.
+#   <katina.rogers@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Neatline\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"POT-Creation-Date: 2012-06-22 11:30-0500\n"
+"PO-Revision-Date: 2012-08-20 16:52+0000\n"
+"Last-Translator: Jeremy Boggs <jeremy@clioweb.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/neatline/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: NeatlineMapsPlugin.php:451
+msgid "Web Map Service"
+msgstr "Web Map Service"
+
+#: controllers/ServersController.php:159
+#, php-format
+msgid "This will permanently delete the %s server."
+msgstr "Cette action supprimera définitivement le serveur %s"
+
+#: forms/ServerForm.php:35
+msgid "An internal (non-public) identifier for the server."
+msgstr "Un identifiant à l'usage interne (privé) pour le serveur."
+
+#: forms/ServerForm.php:42
+msgid "Enter a name."
+msgstr "Indiquez le nom."
+
+#: forms/ServerForm.php:51 views/admin/servers/browse.php:41
+msgid "URL"
+msgstr "URL"
+
+#: forms/ServerForm.php:52
+msgid "The location of the server."
+msgstr "La localisation du serveur."
+
+#: forms/ServerForm.php:59
+msgid "Enter a URL."
+msgstr "Indiquez l'URL."
+
+#: forms/ServerForm.php:75 views/admin/servers/browse.php:42
+msgid "Workspace"
+msgstr "Espace de travail"
+
+#: forms/ServerForm.php:76
+msgid "Enter the Geoserver workspace."
+msgstr "Indiquez l'espace du travail Geoserver"
+
+#: forms/ServerForm.php:83
+msgid "Enter a workspace."
+msgstr "Indiquez un espace de travail."
+
+#: forms/ServerForm.php:93
+msgid "Enter the Geoserver username."
+msgstr "Indiquez un nom d'utilisateur pour Geoserver."
+
+#: forms/ServerForm.php:100
+msgid "Enter a username."
+msgstr "Indiquez un nom d'utilisateur."
+
+#: forms/ServerForm.php:110
+msgid "Enter the Geoserver password."
+msgstr "Indiquez le mot de passe pour Geoserver."
+
+#: forms/ServerForm.php:118
+msgid "Enter a password."
+msgstr "Choisissez un mot de passe."
+
+#: forms/ServerForm.php:128
+msgid "Should this server be used to handle new GeoTiff uploads?"
+msgstr "Voulez-vous utiliser ce serveur pour gérer des nouveaux objets GeoTiff téléchargés?"
+
+#: forms/ServerForm.php:134
+msgid "Save"
+msgstr "Enregistrer"
+
+#: models/NeatlineMapsServer.php:103
+msgid "Online"
+msgstr "En ligne"
+
+#: models/NeatlineMapsServer.php:104
+msgid "Offline"
+msgstr "Déconnecté"
+
+#: models/NeatlineMapsServer.php:105
+msgid "Authentication Error"
+msgstr "Erreur d'authentification"
+
+#: views/admin/items/_serviceForm.php:17
+msgid "WMS Address"
+msgstr "Adresse WMS"
+
+#: views/admin/items/_serviceForm.php:21
+msgid "Enter the WMS address of the map."
+msgstr "Indiquez l'adresse WMS de la carte."
+
+#: views/admin/items/_serviceForm.php:25
+msgid "Layers"
+msgstr "Calques"
+
+#: views/admin/items/_serviceForm.php:29
+msgid "Enter a comma-delimited list of layers."
+msgstr "Indiquez une liste de calques separées par virgules."
+
+#: views/admin/servers/add.php:17
+msgid "Neatline Maps | Create Server"
+msgstr "Neatline Maps | Créer un serveur"
+
+#: views/admin/servers/add.php:24 views/admin/servers/browse.php:25
+#: views/admin/servers/edit.php:24
+msgid "Create a Server"
+msgstr "Créez un serveur"
+
+#: views/admin/servers/browse.php:18
+msgid "Neatline Maps | Browse Servers"
+msgstr "Neatline Maps | Feuilleter des serveurs"
+
+#: views/admin/servers/browse.php:40
+msgid "Server"
+msgstr "Serveur"
+
+#: views/admin/servers/browse.php:43
+msgid "Status"
+msgstr "Statut"
+
+#: views/admin/servers/browse.php:45
+msgid "Actions"
+msgstr "Actions"
+
+#: views/admin/servers/browse.php:69
+msgid "Set Active"
+msgstr "Définir comme actif"
+
+#: views/admin/servers/browse.php:85
+msgid "There are no servers yet."
+msgstr "Il n'existe pas de serveurs."
+
+#: views/admin/servers/browse.php:86
+msgid "Create one!"
+msgstr "Créez-en un!"
+
+#: views/admin/servers/edit.php:17
+msgid "Neatline Maps | Edit Server"
+msgstr "Neatline Maps | Modifier le serveur"
diff --git a/languages/ru.mo b/languages/ru.mo
new file mode 100644
index 0000000..a269629
Binary files /dev/null and b/languages/ru.mo differ
diff --git a/languages/ru.po b/languages/ru.po
new file mode 100644
index 0000000..3f180e9
--- /dev/null
+++ b/languages/ru.po
@@ -0,0 +1,151 @@
+# Translation for the Neatline Time plugin for Omeka.
+# 
+# Translators:
+#   <or8r@virginia.edu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Neatline\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"POT-Creation-Date: 2012-06-22 11:30-0500\n"
+"PO-Revision-Date: 2012-08-30 18:59+0000\n"
+"Last-Translator: Oguljan <or8r@virginia.edu>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/neatline/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: NeatlineMapsPlugin.php:451
+msgid "Web Map Service"
+msgstr "Сервис веб-карт"
+
+#: controllers/ServersController.php:159
+#, php-format
+msgid "This will permanently delete the %s server."
+msgstr "Это приведет к безвозвратному удалению сервера %s."
+
+#: forms/ServerForm.php:35
+msgid "An internal (non-public) identifier for the server."
+msgstr "Внутренний (не общественный) идентификатор сервера."
+
+#: forms/ServerForm.php:42
+msgid "Enter a name."
+msgstr "Введите имя."
+
+#: forms/ServerForm.php:51 views/admin/servers/browse.php:41
+msgid "URL"
+msgstr "URL"
+
+#: forms/ServerForm.php:52
+msgid "The location of the server."
+msgstr "Местоположение сервера."
+
+#: forms/ServerForm.php:59
+msgid "Enter a URL."
+msgstr "Введите URL."
+
+#: forms/ServerForm.php:75 views/admin/servers/browse.php:42
+msgid "Workspace"
+msgstr "Рабочая область памяти"
+
+#: forms/ServerForm.php:76
+msgid "Enter the Geoserver workspace."
+msgstr "Введите рабочую область Geoserver."
+
+#: forms/ServerForm.php:83
+msgid "Enter a workspace."
+msgstr "Введите рабочую область."
+
+#: forms/ServerForm.php:93
+msgid "Enter the Geoserver username."
+msgstr "Введите имя пользователя в Geoserver."
+
+#: forms/ServerForm.php:100
+msgid "Enter a username."
+msgstr "Введите имя пользователя."
+
+#: forms/ServerForm.php:110
+msgid "Enter the Geoserver password."
+msgstr "Введите пароль в Geoserver."
+
+#: forms/ServerForm.php:118
+msgid "Enter a password."
+msgstr "Введите пароль."
+
+#: forms/ServerForm.php:128
+msgid "Should this server be used to handle new GeoTiff uploads?"
+msgstr "Следует ли использовать этот сервер для обработки вновь загружаемых данных в формате GeoTiff? "
+
+#: forms/ServerForm.php:134
+msgid "Save"
+msgstr "Сохранить"
+
+#: models/NeatlineMapsServer.php:103
+msgid "Online"
+msgstr "Онлайн"
+
+#: models/NeatlineMapsServer.php:104
+msgid "Offline"
+msgstr "Офлайн"
+
+#: models/NeatlineMapsServer.php:105
+msgid "Authentication Error"
+msgstr "Ошибка при попытке аутентификации"
+
+#: views/admin/items/_serviceForm.php:17
+msgid "WMS Address"
+msgstr "WMS-адрес"
+
+#: views/admin/items/_serviceForm.php:21
+msgid "Enter the WMS address of the map."
+msgstr "Введите WMS-адрес карты."
+
+#: views/admin/items/_serviceForm.php:25
+msgid "Layers"
+msgstr "Слои"
+
+#: views/admin/items/_serviceForm.php:29
+msgid "Enter a comma-delimited list of layers."
+msgstr "Введите список слоев, разделенных запятыми."
+
+#: views/admin/servers/add.php:17
+msgid "Neatline Maps | Create Server"
+msgstr "Карты Neatline | Создать сервер"
+
+#: views/admin/servers/add.php:24 views/admin/servers/browse.php:25
+#: views/admin/servers/edit.php:24
+msgid "Create a Server"
+msgstr "Создать сервер"
+
+#: views/admin/servers/browse.php:18
+msgid "Neatline Maps | Browse Servers"
+msgstr "Карты Neatline | Просмотреть серверы"
+
+#: views/admin/servers/browse.php:40
+msgid "Server"
+msgstr "Сервер"
+
+#: views/admin/servers/browse.php:43
+msgid "Status"
+msgstr "Статус"
+
+#: views/admin/servers/browse.php:45
+msgid "Actions"
+msgstr "Действия"
+
+#: views/admin/servers/browse.php:69
+msgid "Set Active"
+msgstr "Установка активна"
+
+#: views/admin/servers/browse.php:85
+msgid "There are no servers yet."
+msgstr "Серверов пока не имеется."
+
+#: views/admin/servers/browse.php:86
+msgid "Create one!"
+msgstr "Создайте!"
+
+#: views/admin/servers/edit.php:17
+msgid "Neatline Maps | Edit Server"
+msgstr "Карты Neatline | Редактировать сервер"
diff --git a/languages/template.pot b/languages/template.pot
index 2693104..4e45213 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -15,12 +15,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: NeatlineMapsPlugin.php:357
-msgid "Neatline Maps"
+#: NeatlineMapsPlugin.php:451
+msgid "Web Map Service"
 msgstr ""
 
-#: NeatlineMapsPlugin.php:384
-msgid "Web Map Service"
+#: controllers/ServersController.php:159
+#, php-format
+msgid "This will permanently delete the %s server."
 msgstr ""
 
 #: forms/ServerForm.php:35
@@ -79,6 +80,18 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: models/NeatlineMapsServer.php:103
+msgid "Online"
+msgstr ""
+
+#: models/NeatlineMapsServer.php:104
+msgid "Offline"
+msgstr ""
+
+#: models/NeatlineMapsServer.php:105
+msgid "Authentication Error"
+msgstr ""
+
 #: views/admin/items/_serviceForm.php:17
 msgid "WMS Address"
 msgstr ""
@@ -100,7 +113,7 @@ msgid "Neatline Maps | Create Server"
 msgstr ""
 
 #: views/admin/servers/add.php:24 views/admin/servers/browse.php:25
-#: views/admin/servers/delete.php:24 views/admin/servers/edit.php:24
+#: views/admin/servers/edit.php:24
 msgid "Create a Server"
 msgstr ""
 
@@ -120,36 +133,18 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: views/admin/servers/browse.php:61
-msgid "Online"
-msgstr ""
-
-#: views/admin/servers/browse.php:63
-msgid "Offline"
-msgstr ""
-
-#: views/admin/servers/browse.php:70
+#: views/admin/servers/browse.php:69
 msgid "Set Active"
 msgstr ""
 
-#: views/admin/servers/browse.php:86
+#: views/admin/servers/browse.php:85
 msgid "There are no servers yet."
 msgstr ""
 
-#: views/admin/servers/browse.php:87
+#: views/admin/servers/browse.php:86
 msgid "Create one!"
 msgstr ""
 
-#: views/admin/servers/delete.php:17
-#, php-format
-msgid "Neatline Maps | Delete Server %s"
-msgstr ""
-
-#: views/admin/servers/delete.php:30
-#, php-format
-msgid "This will permanently delete the %s server."
-msgstr ""
-
 #: views/admin/servers/edit.php:17
 msgid "Neatline Maps | Edit Server"
 msgstr ""
diff --git a/lib/GeoserverMap_Abstract.php b/lib/GeoserverMap_Abstract.php
index 42806ae..2414def 100644
--- a/lib/GeoserverMap_Abstract.php
+++ b/lib/GeoserverMap_Abstract.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /** {{{ docblock
  * Abstract class to prepare the map for rendering.
diff --git a/lib/GeoserverMap_WMS.php b/lib/GeoserverMap_WMS.php
index ce0d358..1773273 100644
--- a/lib/GeoserverMap_WMS.php
+++ b/lib/GeoserverMap_WMS.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /** {{{ docblock
  * Concrete class for map with multiple files/layers.
@@ -133,23 +133,27 @@ public function _getBoundingBox()
 
         }
 
-        // Check for reverse axis order.
-        $espgNumber = explode(':', $this->epsg);
-        if ($espgNumber[1] >= 4000 && $espgNumber[1] <= 5000) {
-            $string = implode(',', array(
-                min($minys),
-                min($minxes),
-                max($maxys),
-                max($maxxes)));
-        }
+        if (count($minxes) > 0) {
+            // Check for reverse axis order.
+            $espgNumber = explode(':', $this->epsg);
+            if ($espgNumber[1] >= 4000 && $espgNumber[1] <= 5000) {
+                $string = implode(',', array(
+                    min($minys),
+                    min($minxes),
+                    max($maxys),
+                    max($maxxes)));
+            }
 
-        // If not between 4000 and 5000, do normal order.
-        else {
-            $string = implode(',', array(
-                min($minxes),
-                min($minys),
-                max($maxxes),
-                max($maxys)));
+            // If not between 4000 and 5000, do normal order.
+            else {
+                $string = implode(',', array(
+                    min($minxes),
+                    min($minys),
+                    max($maxxes),
+                    max($maxys)));
+            }
+        } else {
+            $string = '0,0,0,0';
         }
 
         return $string;
diff --git a/models/NeatlineMapsServer.php b/models/NeatlineMapsServer.php
index 73ca6b6..478a7e0 100644
--- a/models/NeatlineMapsServer.php
+++ b/models/NeatlineMapsServer.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Server row class.
@@ -12,9 +12,11 @@
  * @license     http://www.apache.org/licenses/LICENSE-2.0.html Apache 2 License
  */
 
-class NeatlineMapsServer extends Omeka_record
+class NeatlineMapsServer extends Omeka_Record implements Zend_Acl_Resource_Interface
 {
 
+    CONST RESOURCE_ID = 'NeatlineMaps_Servers';
+
     /**
      * The name of the server [string].
      */
@@ -53,21 +55,77 @@ class NeatlineMapsServer extends Omeka_record
      */
     public function isOnline()
     {
+        return ($this->_getHttpCode() == 200);
+    }
 
-        $ch = curl_init($this->url . '/rest/workspaces');
-
-        $authString = $this->username . ':' . $this->password;
-        curl_setopt($ch, CURLOPT_USERPWD, $authString);
+    /**
+     * Tries to contact the GeoServer and authenticate and returns the HTTP 
+     * status code.
+     *
+     * @return int $code The HTTP status code.
+     * @author Eric Rochester <erochest@virginia.edu>
+     **/
+    protected function _getHttpCode()
+    {
+        $ch     = curl_init($this->url . '/rest/workspaces');
 
+        curl_setopt($ch, CURLOPT_USERPWD, "{$this->username}:{$this->password}");
         curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-type: application/xml'));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
 
-        $successCode = 200;
         $buffer = curl_exec($ch);
-        $info = curl_getinfo($ch);
+        $info   = curl_getinfo($ch);
+        $code   = $info['http_code'];
 
-        return ($info['http_code'] == $successCode);
+        return $code;
+    }
+
+    /**
+     * This returns a string indicating the server's status and a CSS class for 
+     * the wrapping element.
+     *
+     * Currently, this is one of these values:
+     *
+     * * 'Online': Everything's just great;
+     * * 'Offline': I can't even talk to the server; or
+     * * 'Authentication Error': The server doesn't recognize me or my
+     *   password.
+     *
+     * Actually, it returns those values after they've been translated for the 
+     * viewer's current locale.
+     *
+     * @return array An array with two keys: 'class' for the class for the span 
+     * and 'message' for the translated string.
+     * @author Eric Rochester <erochest@virginia.edu>
+     **/
+    public function getStatusDisplay()
+    {
+        $online  = __('Online');
+        $offline = __('Offline');
+        $authErr = __('Authentication Error');
+
+        switch ($this->_getHttpCode()) {
+        case 200:
+            $status = $online;
+            $class  = 'online';
+            break;
+
+        case 401:
+        case 403:
+            $status = $authErr;
+            $class  = 'offline';
+            break;
+
+        default:
+            $status = $offline;
+            $class  = 'offline';
+            break;
+        }
 
+        return array(
+            'class'   => $class,
+            'message' => $status
+        );
     }
 
     /**
@@ -126,4 +184,17 @@ public function parentSave()
         parent::save();
     }
 
+    /**
+     * Required by Zend_Acl_Resource_Interface.
+     *
+     * Identifies records as relating to the NeatlineMaps_Servers ACL
+     * resource.
+     *
+     * @return string
+     */
+    public function getResourceId()
+    {
+        return self::RESOURCE_ID;
+    }
+
 }
diff --git a/models/NeatlineMapsServerTable.php b/models/NeatlineMapsServerTable.php
index 98310f5..227d737 100644
--- a/models/NeatlineMapsServerTable.php
+++ b/models/NeatlineMapsServerTable.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Table class for servers.
diff --git a/models/NeatlineMapsService.php b/models/NeatlineMapsService.php
index b89b450..39a7213 100644
--- a/models/NeatlineMapsService.php
+++ b/models/NeatlineMapsService.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * WMS row class.
diff --git a/models/NeatlineMapsServiceTable.php b/models/NeatlineMapsServiceTable.php
index d2dcfb4..eb93b28 100644
--- a/models/NeatlineMapsServiceTable.php
+++ b/models/NeatlineMapsServiceTable.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Table class for Neatline WMS.
diff --git a/plugin.ini b/plugin.ini
index 7e0fd26..4d5733c 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,7 +5,7 @@ description="Connect Omeka with Geoserver, a powerful open-source geospatial ser
 link="https://github.com/scholarslab/NeatlineMaps"
 support_link="https://github.com/scholarslab/NeatlineMaps"
 tags="geospatial temporal"
-version="1.0.0"
+version="1.0.1"
 omeka_minimum_version="1.5"
 omeka_tested_up_to="1.5.1"
 omeka_target_version="1.5.1"
diff --git a/plugin.php b/plugin.php
index bb9e543..a81a40f 100644
--- a/plugin.php
+++ b/plugin.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Define constants and instantiate the mamanger class.
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 429b31e..8a7322d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
 /**
  * Bootstrap for NealtineMaps plugin test runner
  */
diff --git a/tests/fixtures/FixtureBuilderTest.php b/tests/fixtures/FixtureBuilderTest.php
index 21ed6a5..9a44537 100644
--- a/tests/fixtures/FixtureBuilderTest.php
+++ b/tests/fixtures/FixtureBuilderTest.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Special 'test' suite that hits each of the routes in the fixtures controller
diff --git a/tests/integration/AclTest.php b/tests/integration/AclTest.php
new file mode 100644
index 0000000..f95492b
--- /dev/null
+++ b/tests/integration/AclTest.php
@@ -0,0 +1,74 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Test for the NeatlineMaps ACL.
+ */
+class AclTest extends NLMAPS_Test_AppTestCase
+{
+    const RESOURCE = 'NeatlineMaps_Servers';
+
+    /**
+     * Install the plugin.
+     *
+     * @return void.
+     */
+    public function setUp()
+    {
+        $this->setUpPlugin();
+    }
+
+    /**
+     * Data for testAcl
+     */
+    public function acl()
+    {
+        return array(
+            // $isAllowed, $role, $privilege
+            array(false, null, 'add'),
+            array(false, null, 'edit'),
+            array(false, null, 'browse'),            
+            array(false, null, 'delete'),
+            array(false, null, 'active'),
+            array(false, null, 'show'),            
+            array(false, 'researcher', 'add'),
+            array(false, 'researcher', 'edit'),
+            array(false, 'researcher', 'browse'),            
+            array(false, 'researcher', 'delete'),
+            array(false, 'researcher', 'active'),
+            array(false, 'researcher', 'show'),
+            array(false, 'contributor', 'add'),
+            array(false, 'contributor', 'edit'),
+            array(false, 'contributor', 'browse'),            
+            array(false, 'contributor', 'delete'),
+            array(false, 'contributor', 'active'),
+            array(false, 'contributor', 'show'),
+            array(true, 'admin', 'add'),
+            array(true, 'admin', 'edit'),
+            array(true, 'admin', 'browse'),
+            array(true, 'admin', 'delete'),
+            array(true, 'admin', 'active'),
+            array(true, 'admin', 'show'),
+            array(true, 'super', 'add'),
+            array(true, 'super', 'edit'),
+            array(true, 'super', 'browse'),
+            array(true, 'super', 'delete'),
+            array(true, 'super', 'active'),
+            array(true, 'super', 'show')
+        );
+    }
+
+    public function assertPreConditions()
+    {
+        $this->assertTrue($this->acl->has(self::RESOURCE));
+    }
+
+    /**
+     * @dataProvider acl
+     */
+    public function testAcl($isAllowed, $role, $privilege = null)
+    {
+        $this->assertEquals($isAllowed,
+            $this->acl->isAllowed($role, self::RESOURCE, $privilege));
+    }
+}
diff --git a/tests/integration/ItemsControllerTest.php b/tests/integration/ItemsControllerTest.php
index 77efe1d..2462b13 100644
--- a/tests/integration/ItemsControllerTest.php
+++ b/tests/integration/ItemsControllerTest.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Index controller integration tests.
diff --git a/tests/integration/ServersControllerTest.php b/tests/integration/ServersControllerTest.php
index 3229f88..3b7a42b 100644
--- a/tests/integration/ServersControllerTest.php
+++ b/tests/integration/ServersControllerTest.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Servers controller integration tests.
@@ -431,36 +431,4 @@ public function testEditServerActiveUpdating()
 
     }
 
-    /**
-     * /delete should delete the server.
-     *
-     * @return void.
-     */
-    public function testDeleteServer()
-    {
-
-        // Create servers.
-        $server1 = $this->__server();
-        $server2 = $this->__server();
-
-        // Form post.
-        $this->request->setMethod('POST')
-            ->setPost(array()
-        );
-
-        // Capture starting count.
-        $count = $this->serversTable->count();
-
-        // Delete.
-        $this->dispatch('neatline-maps/delete/' . $server1->id);
-
-        // Check count-1.
-        $this->assertEquals($this->serversTable->count(), $count-1);
-
-        // Check correct deletion.
-        $this->assertNull($this->serversTable->find($server1->id));
-        $this->assertNotNull($this->serversTable->find($server2->id));
-
-    }
-
 }
diff --git a/tests/mocks/FileMock.php b/tests/mocks/FileMock.php
index cb8a73d..5157f00 100644
--- a/tests/mocks/FileMock.php
+++ b/tests/mocks/FileMock.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Mock file class.
diff --git a/tests/phpunit_travis.xml b/tests/phpunit_travis.xml
new file mode 100644
index 0000000..beb2672
--- /dev/null
+++ b/tests/phpunit_travis.xml
@@ -0,0 +1,14 @@
+<phpunit bootstrap="bootstrap.php"
+  verbose="true"
+  convertErrorsToExceptions="true"
+  convertWarningsToExceptions="true"
+  colors="true">
+
+  <testsuites>
+    <testsuite name="SolrSearchTests">
+      <directory>integration</directory>
+      <directory>unit</directory>
+    </testsuite>
+  </testsuites>
+
+</phpunit>
diff --git a/tests/unit/NeatlineMapsServerTableTest.php b/tests/unit/NeatlineMapsServerTableTest.php
index 680c188..91a4f3f 100644
--- a/tests/unit/NeatlineMapsServerTableTest.php
+++ b/tests/unit/NeatlineMapsServerTableTest.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Server table tests.
diff --git a/tests/unit/NeatlineMapsServerTest.php b/tests/unit/NeatlineMapsServerTest.php
index 8455172..d9d3400 100644
--- a/tests/unit/NeatlineMapsServerTest.php
+++ b/tests/unit/NeatlineMapsServerTest.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Edition row tests.
diff --git a/tests/unit/NeatlineMapsServiceTableTest.php b/tests/unit/NeatlineMapsServiceTableTest.php
index 3a41f0f..f95165d 100644
--- a/tests/unit/NeatlineMapsServiceTableTest.php
+++ b/tests/unit/NeatlineMapsServiceTableTest.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Edition table tests.
diff --git a/tests/unit/NeatlineMapsServiceTest.php b/tests/unit/NeatlineMapsServiceTest.php
index ba3ce27..6e51fbb 100644
--- a/tests/unit/NeatlineMapsServiceTest.php
+++ b/tests/unit/NeatlineMapsServiceTest.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Edition row tests.
diff --git a/travis_setup.sh b/travis_setup.sh
new file mode 100755
index 0000000..8ef9d9a
--- /dev/null
+++ b/travis_setup.sh
@@ -0,0 +1,32 @@
+#! /usr/bin/env bash
+
+if [ -z $OMEKA_BRANCH ]; then
+  OMEKA_BRANCH=stable-1.5
+fi
+
+export PLUGIN_DIR=`pwd`
+export OMEKA_DIR=`pwd`/omeka
+
+mysql -e "create database IF NOT EXISTS omeka_test;" -uroot;
+git clone https://github.com/omeka/Omeka.git $OMEKA_DIR
+
+# check out the correct branch
+cd $OMEKA_DIR && git checkout $OMEKA_BRANCH
+cd $PLUGIN_DIR
+
+# move configuration files
+mv $OMEKA_DIR/application/config/config.ini.changeme $OMEKA_DIR/application/config/config.ini
+mv $OMEKA_DIR/application/tests/config.ini.changeme $OMEKA_DIR/application/tests/config.ini
+
+# set up testing config
+sed -i 's/db.host = ""/db.host = "localhost"/' $OMEKA_DIR/application/tests/config.ini
+sed -i 's/db.username = ""/db.username = "root"/' $OMEKA_DIR/application/tests/config.ini
+sed -i 's/db.dbname = ""/db.dbname = "omeka_test"/' $OMEKA_DIR/application/tests/config.ini
+sed -i 's/email.to = ""/email.to = "test@example.com"/' $OMEKA_DIR/application/tests/config.ini
+sed -i 's/email.administator = ""/email.administrator = "admin@example.com"/' $OMEKA_DIR/application/tests/config.ini
+sed -i 's/paths.maildir = ""/paths.maildir = "\/tmp"/' $OMEKA_DIR/application/tests/config.ini
+sed -i 's/paths.imagemagick = ""/paths.imagemagick = "\/usr\/bin\/"/' $OMEKA_DIR/application/tests/config.ini
+sed -i 's/256M/512M/' $OMEKA_DIR/application/tests/bootstrap.php
+
+# symlink the plugin
+cd $OMEKA_DIR/plugins && ln -s $PLUGIN_DIR
diff --git a/travis_tests.sh b/travis_tests.sh
new file mode 100755
index 0000000..679723f
--- /dev/null
+++ b/travis_tests.sh
@@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+
+if [ -z $PLUGIN_DIR ]; then
+  PLUGIN_DIR=`pwd`
+fi
+
+if [ -z $OMEKA_DIR ]; then
+  export OMEKA_DIR=`pwd`/omeka
+  echo "omeka_dir set"
+fi
+
+echo "Plugin Directory: $PLUGIN_DIR"
+echo "Omeka Directory: $OMEKA_DIR"
+
+cd tests/ && phpunit --configuration phpunit_travis.xml --coverage-text
diff --git a/views/admin/items/_serviceForm.php b/views/admin/items/_serviceForm.php
index e3627a4..f34f040 100644
--- a/views/admin/items/_serviceForm.php
+++ b/views/admin/items/_serviceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Exhibit selector for item add/edit form.
diff --git a/views/admin/servers/_action_buttons.php b/views/admin/servers/_action_buttons.php
index ceaa6ad..08dd5ca 100644
--- a/views/admin/servers/_action_buttons.php
+++ b/views/admin/servers/_action_buttons.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Browser servers action buttons.
@@ -14,4 +14,4 @@
 ?>
 
 <a href="<?php echo uri($uriSlug . '/edit/' . $server->id); ?>" class="edit"><?php echo __('Edit'); ?></a>
-<a href="<?php echo uri($uriSlug . '/delete/' . $server->id); ?>" class="delete"><?php echo __('Delete'); ?></a>
+<a href="<?php echo uri($uriSlug . '/delete-confirm/' . $server->id); ?>" class="delete-confirm delete"><?php echo __('Delete'); ?></a>
diff --git a/views/admin/servers/_header.php b/views/admin/servers/_header.php
index 610fd1c..3533597 100644
--- a/views/admin/servers/_header.php
+++ b/views/admin/servers/_header.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Header template.
diff --git a/views/admin/servers/add.php b/views/admin/servers/add.php
index 7d63643..2921b24 100644
--- a/views/admin/servers/add.php
+++ b/views/admin/servers/add.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Add server.
diff --git a/views/admin/servers/browse.php b/views/admin/servers/browse.php
index f97926e..80872e1 100644
--- a/views/admin/servers/browse.php
+++ b/views/admin/servers/browse.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Browser servers.
@@ -29,7 +29,7 @@
 
 <?php echo flash(); ?>
 
-<?php if(count($servers) > 0): ?>
+<?php if(count($neatlinemapsservers) > 0): ?>
 
 <table>
 
@@ -49,7 +49,7 @@
 
     <tbody>
         <!-- Servers listings. -->
-        <?php foreach ($servers as $server): ?>
+        <?php foreach ($neatlinemapsservers as $server): ?>
         <tr serverid="<?php echo $server->id; ?>">
             <td class="title">
                 <div><?php echo $server->name; ?></div>
@@ -57,11 +57,10 @@
             <td><a href="<?php echo $server->url; ?>" target="_blank"><?php echo $server->url; ?></a></td>
             <td><?php echo $server->namespace; ?></td>
             <td>
-                <?php if ($server->isOnline()): ?>
-                <span class="online"><?php echo __('Online'); ?></span>
-                <?php else: ?>
-                <span class="offline"><?php echo __('Offline'); ?></span>
-                <?php endif; ?>
+                <?php $status = $server->getStatusDisplay(); ?>
+                <span class="<?php echo $status['class'] ?>">
+                    <?php echo $status['message'] ?>
+                </span>
             </td>
             <td>
                 <?php if ($server->active): ?>
diff --git a/views/admin/servers/delete.php b/views/admin/servers/delete.php
deleted file mode 100644
index 2f64e32..0000000
--- a/views/admin/servers/delete.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
-
-/**
- * Delete server.
- *
- * @package     omeka
- * @subpackage  neatline
- * @author      Scholars' Lab <>
- * @author      David McClure <david.mcclure@virginia.edu>
- * @copyright   2012 The Board and Visitors of the University of Virginia
- * @license     http://www.apache.org/licenses/LICENSE-2.0.html Apache 2 License
- */
-?>
-
-<?php
-$title = __('Neatline Maps | Delete Server %s', $server->name);
-head(array('content_class' => 'neatline', 'title' => $title));
-?>
-
-<?php echo $this->partial('servers/_header.php', array(
-    'title' => $title,
-    'add_button_uri' => 'neatline-maps/add',
-    'add_button_text' => __('Create a Server')
-)); ?>
-
-<div id="primary" class="neatline-delete-confirm-static">
-
-  <h1><?php echo __('Are you sure?'); ?></h1>
-    <p><?php echo __('This will permanently delete the %s server.', $server->name); ?></p>
-
-    <div class="alert-actions">
-        <form method="post">
-        <input type="submit" name="delete-neatline" id="delete-neatline" value="<?php echo __('Delete'); ?>" class="neatline btn delete large">
-        </form>
-    </div>
-
-</div>
-
-<?php
-foot();
-?>
diff --git a/views/admin/servers/edit.php b/views/admin/servers/edit.php
index d2a7f17..2e2d600 100644
--- a/views/admin/servers/edit.php
+++ b/views/admin/servers/edit.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Edit server.
diff --git a/views/shared/show.php b/views/shared/show.php
index df65c06..63febce 100644
--- a/views/shared/show.php
+++ b/views/shared/show.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4; */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Map show partial.