diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 30913d62c..cc424791d 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -12,7 +12,7 @@
     - elsif (contact && contact.pending) || request
       = t('.pending_request')
     - else
-      = link_to "start sharing",
+      = link_to t('people.show.start_sharing'),
         {:controller => "people",
         :action => "share_with",
         :id => person.id},
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index c64c4f8de..893d4b54c 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -21,7 +21,7 @@
   #author_info
     - unless @contact || current_user.person == @person
       .right
-        = link_to "start sharing",
+        = link_to t('.start_sharing'),
           {:controller => "people",
           :action => "share_with",
           :id => @person.id},
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 8995c7e44..b3f2e57c2 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -54,7 +54,7 @@ de:
         change_password: "Mein Passwort ändern"
       new: 
         forgot_password: "Passwort vergessen?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
+        no_account: "Es existiert kein Benutzerkonto mit dieser E-Mail-Adresse.  Falls du auf eine Einladung wartest, dann geben wir dir eine sobald wie möglich."
         send_password_instructions: "Anleitung zum Zurücksetzen des Passworts anfordern"
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt."
       updated: "Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 9efd88e32..3e17b0675 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -269,6 +269,7 @@ ar:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Error al actualizar el perfil"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 017e4b06c..a7190da6f 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -269,6 +269,7 @@ ca:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Tornar als teus aspectes"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "acceptar o ignorar."
     update: 
       failed: "No s'ha pogut actualitzar el teu perfil"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index dc7ab77cb..5b5bb1a44 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -269,6 +269,7 @@ cs:
       recent_public_posts: "Poslední veřejné příspěvky"
       return_to_aspects: "Návrat na vaši stránku s aspekty"
       similar_contacts: "podobné kontakty"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "přijmout nebo ignorovat."
     update: 
       failed: "Aktualizace profilu selhala"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index bab045571..9c300ef98 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -269,6 +269,7 @@ cy:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Failed to update profile"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index a1c841214..be65d7a02 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -269,6 +269,7 @@ da:
       recent_public_posts: "Seneste offentlige indlæg"
       return_to_aspects: "Tilbage til aspektsoversigt"
       similar_contacts: "lignende kontakter"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "at godkende eller ignorere det."
     update: 
       failed: "Kunne ikke opdatere profil"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 97304474f..d5542e8ce 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -160,7 +160,7 @@ de:
       to: "An"
   layouts: 
     application: 
-      have_a_problem: "Du hast ein Problem? Finde eine Antowort hier (Englisch)"
+      have_a_problem: "Du hast ein Problem? Finde hier eine Antwort (Englisch)"
       powered_by: "BETRIEBEN MIT DIASPORA*"
       whats_new: "Was gibt’s Neues?"
     header: 
@@ -269,6 +269,7 @@ de:
       recent_public_posts: "Neueste öffentliche Beiträge"
       return_to_aspects: "Kehre zur Aspekt-Übersicht zurück."
       similar_contacts: "ähnliche Kontakte"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "um zu akzeptieren oder zu ignorieren."
     update: 
       failed: "Ändern des Profils fehlgeschlagen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 7f0f92f09..036d925ec 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -269,6 +269,7 @@ el:
       recent_public_posts: "Πρόσφατες Δημόσιες Δημοσιεύσεις"
       return_to_aspects: "Επιστροφή στη σελίδα με τις πτυχές σας"
       similar_contacts: "παρόμοιες επαφές"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "να το αποδεχθεί ή να το αγνοήσει."
     update: 
       failed: "Αποτυχία ενημέρωσης προφίλ"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 7812e9609..1d33d5818 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -360,6 +360,7 @@ en:
           recent_posts: "Recent Posts"
           recent_public_posts: "Recent Public Posts"
           similar_contacts: "similar contacts"
+          start_sharing: "start sharing"
       edit:
           info_available_to: "This info will be available to whomever you connect with on Diaspora."
           your_profile: "Your profile"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 444c14834..7b7d0a54a 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -269,6 +269,7 @@ en_shaw:
       recent_public_posts: "𐑮𐑰𐑕𐑩𐑯𐑑 𐑐𐑳𐑚𐑤𐑦𐑒 𐑐𐑴𐑕𐑑𐑕"
       return_to_aspects: "𐑮𐑦𐑑𐑻𐑯 𐑑 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕 𐑐𐑱𐑡"
       similar_contacts: "𐑕𐑦𐑥𐑦𐑤𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑹 𐑦𐑜𐑯𐑹 𐑦𐑑."
     update: 
       failed: "𐑓𐑱𐑤𐑛 𐑑 𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 80e5c7555..119f70ef7 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -269,6 +269,7 @@ eo:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Failed to update profile"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 23b318588..66df8f25d 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -269,6 +269,7 @@ es-CL:
       recent_public_posts: "Posteos Públicos Recientes"
       return_to_aspects: "Volver a tu página de aspectos"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "aceptar o ignorar."
     update: 
       failed: "Error al actualizar perfil"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 02a72ea5f..a48d19ece 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -269,6 +269,7 @@ es:
       recent_public_posts: "Comentarios públicos recientes"
       return_to_aspects: "Volver a tus aspectos"
       similar_contacts: "contactos similares"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "aceptar o ignorar."
     update: 
       failed: "No se pudo actualizar el perfil"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 6b535ae37..7b203857c 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -269,6 +269,7 @@ fi:
       recent_public_posts: "Viimeisimmät julkiset tapahtumat"
       return_to_aspects: "Palaa näkymiin"
       similar_contacts: "Yhteiset kontaktit"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "hyväksyäksesi, tai hylätäksesi sen."
     update: 
       failed: "Profiilin päivittäminen epäonnistui"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index d21d05596..bd74580e9 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -269,6 +269,7 @@ fr:
       recent_public_posts: "Messages publics récents"
       return_to_aspects: "Retourner à votre page des aspects"
       similar_contacts: "Contacts similaires"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "pour l'accepter ou l'ignorer."
     update: 
       failed: "La mise à jour du profil a échoué"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 72e239f84..f8d5efdd6 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -269,6 +269,7 @@ ga:
       recent_public_posts: "Póstanna Phoiblí Déanaí"
       return_to_aspects: "Dul siar chuig leathanach gnéithe"
       similar_contacts: "teagmháillí cosúil"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "chun glacadh leis nó neamhaird a dhéanamh de"
     update: 
       failed: "Níor éirigh le do próifíl a nuashonrú"
diff --git a/config/locales/diaspora/gl-ES.yml b/config/locales/diaspora/gl-ES.yml
index a589aaa23..81fbef02c 100644
--- a/config/locales/diaspora/gl-ES.yml
+++ b/config/locales/diaspora/gl-ES.yml
@@ -269,6 +269,7 @@ gl-ES:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Non se puido actualizar o perfil"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 111f814fe..78396641a 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -269,6 +269,7 @@ he:
       recent_public_posts: "הרשומות הציבוריות האחרונות"
       return_to_aspects: "באפשרותך לחזור לעמוד ההיבטים שלך"
       similar_contacts: "אנשי קשר דומים"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "כדי לקבל או לדחות אותה."
     update: 
       failed: "אירע כשל בעדכון הפרופיל"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index b44187379..4db699811 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -269,6 +269,7 @@ hu:
       recent_public_posts: "Legutóbbi nyilvános hozzászólások"
       return_to_aspects: "Menj vissza a csoportokhoz"
       similar_contacts: "hasonló kapcsolatok"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "hogy elfogadd vagy elutasítsd."
     update: 
       failed: "Profil frissítése sikertelen"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 623664a42..4f76b95e5 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -269,6 +269,7 @@ id:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Failed to update profile"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 931a90cb7..ebf4163e9 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -269,6 +269,7 @@ it:
       recent_public_posts: "Post pubblici recenti"
       return_to_aspects: "Torna alla pagina dei tuoi aspetti"
       similar_contacts: "contatti simili"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "per accettarla o ignorarla."
     update: 
       failed: "Impossibile aggiornare il profilo"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 1ebf037ad..0dd4785d3 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -269,6 +269,7 @@ lt:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Grįžti į aspektų puslapį"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "priimti arba ignoruoti."
     update: 
       failed: "Nepavyko atnaujinti profilio"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 334947b2d..06d217c7f 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -269,6 +269,7 @@ mk:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Неуспешно ажурирање на профил"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 344dffc57..ace94057b 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -269,6 +269,7 @@ nb:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Failed to update profile"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 9695bcc76..6d9974913 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -269,6 +269,7 @@ nl:
       recent_public_posts: "Recente Openbare Berichten"
       return_to_aspects: "Ga terug naar je aspecten pagina"
       similar_contacts: "vergelijkbare contacten"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "om te accepteren of te negeren."
     update: 
       failed: "Updaten van profiel mislukt"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index f0c62665c..0fe17c6ab 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -269,6 +269,7 @@ pl:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Wróć do strony aspektów"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "by je przyjąć lub zignorować."
     update: 
       failed: "Nie udało się zaktualizować profilu"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 8aa53146c..143f89843 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -269,6 +269,7 @@ pt-BR:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Retornar à sua página de aspectos"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "para aceitar ou ignorar."
     update: 
       failed: "Erro ao atualizar perfil"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 16be6e2c3..c84a1e7ab 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -269,6 +269,7 @@ pt-PT:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Voltar à página dos grupos"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "para o aceitares ou ignorares"
     update: 
       failed: "Falha ao actualizar o perfil"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index a7d11bdf9..89e3f9c4e 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -269,6 +269,7 @@ ro:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Failed to update profile"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1cdd1a4ce..baaeef889 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -269,6 +269,7 @@ ru:
       recent_public_posts: "Последние Публичные Посты"
       return_to_aspects: "Вернуться на страницу аспектов"
       similar_contacts: "аналогичные контакты"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "принять или игнорировать."
     update: 
       failed: "Не удалось обновить профиль"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index e437224fc..fc3e80d58 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -269,6 +269,7 @@ sk:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Vrátiť sa na stránku aspektov"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "akceptovať, alebo ignorovať."
     update: 
       failed: "Aktualizácia profilu zlyhala"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 2ec1007d3..269ed61a8 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -269,6 +269,7 @@ sl:
       recent_public_posts: "Zadnje javne objave"
       return_to_aspects: "Vrnite se na vašo stran s skupinami"
       similar_contacts: "podobni stiki"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "sprejmite ali zavrnite."
     update: 
       failed: "Posodobitev profila ni uspelo"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index cee6f6101..efe6ef452 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -269,6 +269,7 @@ sv:
       recent_public_posts: "Senaste publika inlägg"
       return_to_aspects: "Återgå till översikten"
       similar_contacts: "liknande kontakter"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "for att acceptera eller ignorera."
     update: 
       failed: "Misslyckades med att uppdatera profilen"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index d5b22cc3f..9929e7a54 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -269,6 +269,7 @@ tr:
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "similar contacts"
+      start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
       failed: "Failed to update profile"
diff --git a/public/javascripts/aspect-filters.js b/public/javascripts/aspect-filters.js
index 079799af6..d780ae4bd 100644
--- a/public/javascripts/aspect-filters.js
+++ b/public/javascripts/aspect-filters.js
@@ -117,7 +117,10 @@ $(document).ready(function(){
 
 
     // set url
-    history.pushState(null, document.title, newURL);
+    // some browsers (Firefox for example) don't support pushState
+    if (typeof(history.pushState) == 'function') {
+      history.pushState(null, document.title, newURL);
+    }
 
     $.ajax({
       url : newURL,
diff --git a/script/server b/script/server
index 58576b4d6..ce767beea 100755
--- a/script/server
+++ b/script/server
@@ -7,8 +7,10 @@ realpath=$( ruby -e "puts File.expand_path(\"$0\")")
 cd $( dirname $realpath)/..
 OS=`uname -s`
 
+
 [ -e config/server.sh ] && source config/server.sh
 
+
 function init_public
 # Create all dynamically generated files in public/ folder
 {
@@ -20,7 +22,12 @@ function init_public
         wget -q -O tmp/server.html http://localhost:$THIN_PORT && \
             rm tmp/server.html && break
     done
-    bundle exec thin --pid log/thin.pid stop
+    if [ -e 'log/thin.pid' ]; then
+        bundle exec thin --pid log/thin.pid stop
+    else
+        echo "Warning: Something is wrong in your installation, thin didn't come up for the first time initialization!" >&2
+        echo "Try starting it manually with bundle exec thin start and look at the output." >&2
+    fi
     if [ -e tmp/server.html ]; then
         echo "Cannot get index.html from web server (aborted)" >&2
         return 2
@@ -28,6 +35,7 @@ function init_public
     bundle exec jammit
 }
 
+
 function chk_service
 {
     port=${1:?Missing port}
@@ -43,6 +51,7 @@ function chk_service
     esac
 }
 
+
 function redis_config
 # Create/update the local redis.conf file from /etc master
 {
@@ -75,6 +84,7 @@ function redis_config
         config/redis.conf
 }
 
+
 # Scan for -p, find out what port thin is about to use.
 args="$DEFAULT_THIN_ARGS $@"
 prev_arg=''
@@ -84,6 +94,7 @@ do
     prev_arg="$arg"
 done
 
+
 # Is someone listening on the ports already? (ipv4 only test ?)
 services=$( chk_service $THIN_PORT )
 if [ -n "$services" ]; then
@@ -110,6 +121,7 @@ fi
 
 redis_config
 
+
 # Force AGPL
 if [ -w public -a ! -e  public/source.tar.gz ]; then
     branch=$( git branch | awk '/^[*]/ {print $2}')
@@ -120,6 +132,19 @@ if [ ! -e public/source.tar.gz ]; then
     exit 65
 fi
 
+
+# Check if config files exists
+if [ ! -e 'config/app_config.yml' ]; then
+    echo "config/app_config.yml is missing! Copy over config/app_config.yml.example to config/app_config.yml and edit it properly!" >&2
+    exit 67
+fi
+
+if [ ! -e 'config/database.yml' ]; then
+    echo 'config/database.yml is missing! Copy over config/database.yml.example to config/database.yml and edit it properly!' >&2
+    exit 68
+fi
+
+
 # Precache jammit assets
 if [[ -w public  && ! -e 'public/stylesheets/application.css' ]]; then
     if [ "$INIT_PUBLIC" != 'no' ]; then
@@ -127,9 +152,9 @@ if [[ -w public  && ! -e 'public/stylesheets/application.css' ]]; then
         init_public
     fi
 fi
+
 if [ ! -e 'public/stylesheets/application.css' ]; then
     echo 'Jammit precache error (now or at install)' >&2
-    exit 66
 fi