diff --git a/Gemfile.lock b/Gemfile.lock
index 0f40512..932a1cf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -272,6 +272,3 @@ DEPENDENCIES
   spork (~> 0.9.2)
   uglifier (>= 1.0.3)
   will_paginate (~> 3.0.3)
-
-BUNDLED WITH
-   1.13.6
diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml
index 3f65132..90d06b1 100644
--- a/app/views/bikes/new.html.haml
+++ b/app/views/bikes/new.html.haml
@@ -22,7 +22,7 @@
         .help-block
 
       .form-group
-        .btn-group{"data-toggle": 'buttons'}
+        .btn-group(data-toggle="buttons")
           %label.btn.btn-default
             = radio_button_tag 'bike_style', 3
             RD
@@ -43,7 +43,7 @@
         .help-block
 
       .form-group
-        .btn-group{ "data-toggle": 'buttons'}
+        .btn-group(data-toggle="buttons")
           %label.btn.btn-default
             = radio_button_tag 'bike_condition', 2
             Poor
@@ -70,4 +70,4 @@
           %input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" }
 
       .form-group
-        = button_tag 'Add Bike', id: 'add_bike_submit', class: 'btn btn-primary', "data-url": "#{api_create_bike_path}"
\ No newline at end of file
+        = button_tag 'Add Bike', id: 'add_bike_submit', class: 'btn btn-primary', data: {url: api_create_bike_path}
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index fad9fb6..c4dcbe3 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,8 +1,8 @@
 !!! 5
 %html{lang: 'en'}
   %head
-    %meta{charset: 'utf-8'}/
-    %meta{name: 'viewport', content: 'width=device-width', "initial-scale": '1.0'}
+    %meta(charset="utf-8")/
+    %meta(name="viewport" content="width=device-width" initial-scale="1.0")/
     %title= content_for?(:title) ? yield(:title) : 'Velocipede'
     = csrf_meta_tags
     = stylesheet_link_tag 'application', media: 'all'
diff --git a/app/views/task_lists/edit.haml b/app/views/task_lists/edit.haml
index b67bf06..5fe6377 100644
--- a/app/views/task_lists/edit.haml
+++ b/app/views/task_lists/edit.haml
@@ -13,8 +13,8 @@
     - @task_list.tasks.each do |task|
       .checkbox
         %label
-          = check_box_tag nil, nil, task.done, class: 'task_list_task', type: 'checkbox', "data-id": task.id
+          = check_box_tag nil, nil, task.done, class: 'task_list_task', type: 'checkbox', data: {id: task.id}
           = task.task
 
   .form-group
-    = button_tag 'Save Changes', id: 'update_tasks_submit', class: 'btn btn-primary disabled', "data-url": "#{api_update_task_path}"
+    = button_tag 'Save Changes', id: 'update_tasks_submit', class: 'btn btn-primary disabled', data: {url: api_update_task_path}
diff --git a/app/views/time_entries/index.haml b/app/views/time_entries/index.haml
index 3f810f0..94ce43a 100644
--- a/app/views/time_entries/index.haml
+++ b/app/views/time_entries/index.haml
@@ -18,7 +18,7 @@
     - @user_time_entries.each do |entry|
       -# data: {start_date: ..} gets transformed to data-start-date instead of data-start_date, we don't want this
       %tr{data: {id: entry.id, description: entry.description, duration: entry.duration_in_hours},
-          "data-start_date": entry.start_date.to_date.to_formatted_s(:rfc822)}
+          "data-start_date" => entry.start_date.to_date.to_formatted_s(:rfc822)}
         %td= entry.start_date.to_date.to_formatted_s(:rfc822)
         %td= entry.duration_in_hours
         %td= entry.type
@@ -29,19 +29,19 @@
 
 = link_to 'Add Time Entry', new_time_entry_path, class: 'btn btn-primary'
 
-.modal#confirmation{role: 'dialog', "aria-labelledby": 'confirmation_title', "aria-hidden": 'true', tabindex: -1}
+.modal#confirmation(role="dialog" aria-labelledby="confirmation_title" aria-hidden="true" tabindex="-1")
   .modal-dialog
     .modal-content
       .modal-header
-        %button.close{"data-dismiss": 'modal', "aria-hidden": 'true'} ×
+        %button.close(data-dismiss="modal" aria-hidden="true") ×
         %h4#confirmation_title Are you sure you want to delete?
       .modal-body
         #work_entry_start_date Start Date
         #work_entry_duration Duration
         #work_entry_description Description
       .modal-footer
-        %button.btn.btn-default{"data-dismiss": 'modal', "aria-hidden": 'true'} Cancel
-        %button.btn.btn-danger#confirmation_delete{"data-url": "api/v1/time_entries/"} Delete
+        %button.btn.btn-default(data-dismiss="modal" aria-hidden="true") Cancel
+        %button.btn.btn-danger#confirmation_delete(data-url="api/v1/time_entries/") Delete
 
 
 
diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml
index f5580e5..6bc5ffd 100644
--- a/app/views/time_entries/new.haml
+++ b/app/views/time_entries/new.haml
@@ -32,7 +32,7 @@
           .help-block
 
       .form-group
-        .btn-group{"data-toggle": 'buttons'}
+        .btn-group(data-toggle="buttons")
           %label.btn.btn-default
             = radio_button_tag 'action_id', 1, false, autocomplete: 'off'
             Volunteer