add bootstrap to bower file, remove fontawesome from css since includ…

…ed in app.haml, pin mysql gem .. what a fuckup

Gemfile

@@ -16,11 +16,12 @@ gem 'sass-rails'
 gem 'coffee-rails'
 gem 'uglifier'
 gem 'therubyracer'
+gem 'eventmachine', '~>1.0.4'
 
 gem 'chronic'
 
 group :test, :development do
-  gem 'mysql2'
+  gem 'mysql2', '~> 0.3.13'
   gem 'pry-rails'
   gem 'rspec-rails'
   gem 'byebug'

Gemfile.lock

@@ -83,7 +83,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    eventmachine (1.0.3)
+    eventmachine (1.0.9.1)
     execjs (2.2.2)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
@@ -104,7 +104,7 @@ GEM
     mime-types (2.4.2)
     minitest (5.4.2)
     multi_json (1.10.1)
-    mysql2 (0.3.16)
+    mysql2 (0.3.21)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -226,10 +226,11 @@ DEPENDENCIES
   capistrano-ext
   chronic
   coffee-rails
+  eventmachine (~> 1.0.4)
   factory_girl_rails
   haml
   json
-  mysql2
+  mysql2 (~> 0.3.13)
   non-stupid-digest-assets
   pg
   pry-rails
@@ -248,3 +249,6 @@ DEPENDENCIES
   unicorn
   vcr
   webmock
+
+BUNDLED WITH
+   1.15.4

app/assets/stylesheets/application.css.scss

@@ -1,6 +1,5 @@
 /*
  *= require bootstrap/dist/css/bootstrap.css
- *= require font-awesome/css/font-awesome.css
  *= require schmuugle.css
  *= require select2
  *= require select2-bootstrap

bower.json

@@ -7,6 +7,7 @@
   "vendor": {
     "name": "bower-rails generated vendor assets",
     "dependencies": {
+      "bootstrap": "3.2.0",
       "jquery-ui": "https://github.com/components/jqueryui.git",
       "jquery-ujs": "https://github.com/rails/jquery-ujs.git"
     }