updated thin/eventmachine to fix 'trap 6' problem on OSX for some

see: https://github.com/eventmachine/eventmachine/issues/698

Gemfile

@@ -192,7 +192,7 @@ end
 
 group :development do
   gem 'letter_opener'
-  gem 'thin'
+  gem 'thin', '~> 1.7.0'
   gem 'faker'
   gem 'quiet_assets'
   gem 'livingstyleguide', '~> 2.0.0.pre.1'

Gemfile.lock

@@ -242,7 +242,7 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    eventmachine (1.2.0)
+    eventmachine (1.2.0.1)
     excon (0.48.0)
     execjs (2.6.0)
     factory_girl (4.5.0)
@@ -532,10 +532,10 @@ GEM
     syck (1.0.5)
     sys-filesystem (1.1.5)
       ffi
-    thin (1.6.4)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
+      rack (>= 1, < 3)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
@@ -686,7 +686,7 @@ DEPENDENCIES
   svg-graph!
   syck (~> 1.0.5)
   sys-filesystem (~> 1.1.4)
-  thin
+  thin (~> 1.7.0)
   timecop (~> 0.8)
   transactional_lock!
   tzinfo-data
@@ -697,4 +697,4 @@ DEPENDENCIES
   will_paginate (~> 3.1)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5