Merging again

config/database.yml

@@ -18,8 +18,8 @@ development:
   adapter: postgresql
   encoding: unicode
   database: bike_bike_dev
-  username: bike_bike
-  password: NewOrleans@)!#
+  username: analyst
+  password: 
   host: 127.0.0.1
   port: 5432
   pool: 5
@@ -34,12 +34,12 @@ development:
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
+test: &test
   adapter: postgresql
   encoding: unicode
   database: bike_bike_test
-  username: bike_bike
-  password: NewOrleans@)!#
+  username: analyst
+  password:
   host: 127.0.0.1
   port: 5432
   pool: 5
@@ -53,3 +53,6 @@ production:
   host: 127.0.0.1
   port: 5432
   pool: 5
+
+cucumber:
+  <<: *test

config/locales/translation-info.yml

@@ -0,0 +1,31 @@
+---
+nola_2013.about:
+  languages: []
+  pages:
+  - /
+  data: []
+home.its_awesome:
+  languages: []
+  pages:
+  - /
+  data: []
+Conferences:
+  languages: []
+  pages:
+  - /
+  data: []
+Organizations:
+  languages: []
+  pages:
+  - /
+  data: []
+Resources:
+  languages: []
+  pages:
+  - /
+  data: []
+Sign_In:
+  languages: []
+  pages:
+  - /
+  data: []