diff --git a/.rubocop.yml b/.rubocop.yml
index e577a33f..c948dd55 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,9 +1,6 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  Include:
-    - '**/Rakefile'
-    - '**/config.ru'
   Exclude:
     - 'db/schema.rb'
     - 'vendor/bundle/**/*'
@@ -12,3 +9,4 @@ AllCops:
     - 'archive/**/*'
     - 'design/**/*'
     - 'tools/**/*'
+    - 'bin/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5aaa7ff3..544d6565 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,41 +1,36 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-11-14 11:11:33 +0100 using RuboCop version 0.51.0.
+# on 2018-06-15 23:21:42 +0000 using RuboCop version 0.57.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 6
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/Gemfile, **/gems.rb
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: with_first_parameter, with_fixed_indentation
-Layout/AlignParameters:
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
   Exclude:
-    - 'bin/mina'
+    - 'app/controllers/comments_controller.rb'
+    - 'app/controllers/markdown_controller.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: leading, trailing
 Layout/DotPosition:
   Exclude:
     - 'app/controllers/projects_controller.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'bin/mina'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
@@ -57,41 +52,39 @@ Layout/EmptyLinesAroundAccessModifier:
     - 'app/controllers/users_controller.rb'
     - 'app/models/project.rb'
 
-# Offense count: 7
+# Offense count: 6
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
 Layout/EmptyLinesAroundClassBody:
   Exclude:
     - 'app/controllers/api_controller.rb'
-    - 'app/controllers/comments_controller.rb'
     - 'app/controllers/projects_controller.rb'
     - 'app/controllers/users_controller.rb'
     - 'app/models/episode.rb'
     - 'db/migrate/20130906125641_add_project_counter_cache.rb'
     - 'db/migrate/20130919165239_add_aasm_state.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
     - 'app/models/user.rb'
-    - 'bin/rails'
     - 'config.ru'
     - 'script/rails'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
 Layout/IndentHeredoc:
   Exclude:
     - 'spec/controllers/api_controller_spec.rb'
 
-# Offense count: 19
+# Offense count: 20
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: normal, rails
 Layout/IndentationConsistency:
   Exclude:
@@ -102,12 +95,17 @@ Layout/IndentationConsistency:
     - 'app/models/project.rb'
     - 'app/models/project_importer.rb'
 
-# Offense count: 13
+# Offense count: 33
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Exclude:
+    - 'app/controllers/episodes_controller.rb'
     - 'app/controllers/gallery_controller.rb'
+    - 'app/controllers/projects_controller.rb'
+    - 'app/controllers/users_controller.rb'
+    - 'app/models/project.rb'
+    - 'app/models/project_importer.rb'
     - 'spec/controllers/episodes_controller_spec.rb'
     - 'spec/controllers/projects_controller_spec.rb'
     - 'spec/controllers/users_controller_spec.rb'
@@ -127,22 +125,30 @@ Layout/MultilineBlockLayout:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
 Layout/MultilineMethodCallIndentation:
   Exclude:
     - 'app/controllers/projects_controller.rb'
 
-# Offense count: 25
+# Offense count: 26
 # Cop supports --auto-correct.
 Layout/SpaceAfterColon:
   Exclude:
     - 'spec/controllers/projects_controller_spec.rb'
     - 'spec/controllers/users_controller_spec.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Layout/SpaceAfterComma:
+  Exclude:
+    - 'app/controllers/comments_controller.rb'
+    - 'app/controllers/markdown_controller.rb'
+    - 'app/helpers/application_helper.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
 Layout/SpaceAroundEqualsInParameterDefault:
   Exclude:
@@ -158,7 +164,7 @@ Layout/SpaceAroundOperators:
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, SupportedStylesForEmptyBraces.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceBeforeBlockBraces:
@@ -172,22 +178,12 @@ Layout/SpaceBeforeComma:
   Exclude:
     - 'Vagrantfile'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'app/controllers/announcements_controller.rb'
-    - 'lib/haml/filters/markdown.rb'
-    - 'lib/tasks/dev.rake'
-    - 'spec/controllers/projects_controller_spec.rb'
-    - 'spec/features/project_management_spec.rb'
-
 # Offense count: 20
 # Cop supports --auto-correct.
-Layout/SpaceInsideBrackets:
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBrackets: space, no_space
+Layout/SpaceInsideArrayLiteralBrackets:
   Exclude:
     - 'app/controllers/about_controller.rb'
     - 'app/controllers/announcements_controller.rb'
@@ -198,9 +194,22 @@ Layout/SpaceInsideBrackets:
     - 'app/controllers/users_controller.rb'
     - 'app/models/project.rb'
 
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'app/controllers/announcements_controller.rb'
+    - 'lib/haml/filters/markdown.rb'
+    - 'lib/tasks/dev.rake'
+    - 'spec/controllers/projects_controller_spec.rb'
+    - 'spec/features/project_management_spec.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
@@ -215,7 +224,7 @@ Layout/SpaceInsidePercentLiteralDelimiters:
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
 Layout/TrailingBlankLines:
   Exclude:
@@ -223,34 +232,24 @@ Layout/TrailingBlankLines:
     - 'spec/models/comment_spec.rb'
     - 'spec/support/sphinx_helpers.rb'
 
-# Offense count: 8
+# Offense count: 9
 # Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
     - 'app/controllers/api_controller.rb'
+    - 'app/helpers/application_helper.rb'
     - 'db/migrate/20131011112148_user_belong_to_roles.rb'
     - 'spec/factories/episode_project_associations.rb'
     - 'spec/factories/projects.rb'
     - 'spec/features/search_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'bin/spring'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Lint/DeprecatedClassMethods:
   Exclude:
     - 'lib/tasks/dev.rake'
 
-# Offense count: 2
-Lint/HandleExceptions:
-  Exclude:
-    - 'bin/rails'
-    - 'bin/rake'
-
 # Offense count: 3
 Lint/IneffectiveAccessModifier:
   Exclude:
@@ -285,18 +284,12 @@ Metrics/BlockLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 156
+  Max: 164
 
 # Offense count: 1
 Metrics/CyclomaticComplexity:
   Max: 8
 
-# Offense count: 79
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 222
-
 # Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
@@ -312,30 +305,23 @@ Naming/AccessorMethodName:
     - 'app/controllers/comments_controller.rb'
     - 'app/models/project_importer.rb'
 
-# Offense count: 2
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Naming/FileName:
-  Exclude:
-    - 'Gemfile'
-    - 'Vagrantfile'
-
 # Offense count: 1
 # Configuration parameters: Blacklist.
-# Blacklist: END, (?-mix:EO[A-Z]{1})
+# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'spec/controllers/api_controller_spec.rb'
 
 # Offense count: 2
+# Configuration parameters: AllowedChars.
 Style/AsciiComments:
   Exclude:
     - 'app/controllers/search_controller.rb'
     - 'spec/features/search_spec.rb'
 
-# Offense count: 21
+# Offense count: 24
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
@@ -349,7 +335,8 @@ Style/BlockDelimiters:
     - 'spec/features/project_management_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
@@ -357,7 +344,7 @@ Style/ClassAndModuleChildren:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: is_a?, kind_of?
 Style/ClassCheck:
   Exclude:
@@ -371,13 +358,14 @@ Style/CommentAnnotation:
   Exclude:
     - 'spec/features/search_spec.rb'
 
-# Offense count: 5
+# Offense count: 6
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
     - 'app/controllers/application_controller.rb'
+    - 'app/controllers/projects_controller.rb'
     - 'app/models/project_importer.rb'
     - 'app/models/user.rb'
 
@@ -392,7 +380,7 @@ Style/DoubleNegation:
 
 # Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
   Exclude:
@@ -400,6 +388,14 @@ Style/EmptyMethod:
     - 'app/controllers/projects_controller.rb'
     - 'app/controllers/users_controller.rb'
 
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Exclude:
+    - 'Rakefile'
+    - 'script/rails'
+    - 'spec/rails_helper.rb'
+
 # Offense count: 6
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -411,7 +407,7 @@ Style/GuardClause:
 
 # Offense count: 28
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 Style/HashSyntax:
   Exclude:
@@ -435,9 +431,8 @@ Style/IfInsideElse:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/application_helper.rb'
 
-# Offense count: 11
+# Offense count: 16
 # Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Exclude:
     - 'app/controllers/projects_controller.rb'
@@ -446,9 +441,9 @@ Style/IfUnlessModifier:
     - 'app/models/project_importer.rb'
     - 'app/models/user.rb'
 
-# Offense count: 14
+# Offense count: 15
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
 Style/MethodDefParentheses:
   Exclude:
@@ -459,6 +454,14 @@ Style/MethodDefParentheses:
     - 'app/models/project_importer.rb'
     - 'app/models/user.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
+  Exclude:
+    - 'app/controllers/comments_controller.rb'
+    - 'app/controllers/markdown_controller.rb'
+    - 'app/helpers/application_helper.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/MutableConstant:
@@ -467,7 +470,7 @@ Style/MutableConstant:
 
 # Offense count: 10
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: both, prefix, postfix
 Style/NegatedIf:
   Exclude:
@@ -484,7 +487,7 @@ Style/NonNilCheck:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AllowSafeAssignment.
+# Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
 Style/ParenthesesAroundCondition:
   Exclude:
     - 'app/controllers/application_controller.rb'
@@ -510,7 +513,7 @@ Style/RedundantReturn:
   Exclude:
     - 'app/models/user.rb'
 
-# Offense count: 31
+# Offense count: 33
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
@@ -521,7 +524,7 @@ Style/RedundantSelf:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Exclude:
@@ -535,15 +538,15 @@ Style/RescueModifier:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: only_raise, only_fail, semantic
 Style/SignalException:
   Exclude:
     - 'lib/tasks/dev.rake'
 
-# Offense count: 26
+# Offense count: 13
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
@@ -551,20 +554,23 @@ Style/StringLiterals:
     - 'app/controllers/episodes_controller.rb'
     - 'app/controllers/users_controller.rb'
     - 'app/models/project.rb'
-    - 'bin/mina'
-    - 'bin/rails'
-    - 'bin/rake'
-    - 'bin/spring'
     - 'db/migrate/20130912160959_add_devise_to_users.rb'
     - 'db/seeds.rb'
     - 'lib/haml/filters/markdown.rb'
     - 'spec/factories/comments.rb'
+    - 'spec/features/project_management_spec.rb'
     - 'spec/models/comment_spec.rb'
     - 'spec/support/shared_examples/a_markdown_renderer.rb'
 
-# Offense count: 16
+# Offense count: 17
 # Cop supports --auto-correct.
-# Configuration parameters: MinSize, SupportedStyles.
+# Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
   EnforcedStyle: brackets
+
+# Offense count: 77
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 222