diff --git a/.rubocop.yml b/.rubocop.yml
index 18b0dda..b629e16 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,12 @@
-inherit_from: .rubocop_todo.yml
\ No newline at end of file
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+  - 'examples/**/**'
+  - 'test/**/**'
+  - 'lib/cli.rb'
+  - '*.gemspec'
+
+Metrics/LineLength:
+  Max: 100
+
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ba1abfb..ecc8f80 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,300 +1,497 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-08-14 10:29:23 +0100 using RuboCop version 0.32.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-07-20 18:43:01 +0100 using RuboCop version 0.41.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: 1
-Lint/ParenthesesAsGroupedExpression:
-  Enabled: false
+# Offense count: 8
+Lint/IneffectiveAccessModifier:
+  Exclude:
+    - 'lib/datasift.rb'
 
 # Offense count: 1
 Lint/RescueException:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Lint/SpaceBeforeFirstArg:
-  Enabled: false
+# Offense count: 1
+Lint/ShadowedException:
+  Exclude:
+    - 'lib/datasift.rb'
 
 # Offense count: 5
 # Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
 Lint/UnusedBlockArgument:
-  Enabled: false
+  Exclude:
+    - 'examples/live_stream_eg.rb'
+    - 'lib/datasift.rb'
 
-# Offense count: 2
+# Offense count: 1
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/datasift.rb'
+
+# Offense count: 4
 Lint/UselessAssignment:
-  Enabled: false
+  Exclude:
+    - 'examples/tmp.rb'
+    - 'lib/datasift.rb'
+    - 'test/datasift/odp/batch_upload_test.rb'
 
-# Offense count: 27
+# Offense count: 34
 Metrics/AbcSize:
-  Max: 106
+  Max: 183
 
-# Offense count: 1
+# Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 108
+  Max: 167
 
-# Offense count: 13
+# Offense count: 19
 Metrics/CyclomaticComplexity:
   Max: 15
 
-# Offense count: 118
-# Configuration parameters: AllowURI, URISchemes.
-LineLength:
-  Max: 100
-
-# Offense count: 33
+# Offense count: 40
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 91
+  Max: 161
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 232
+  Max: 250
 
-# Offense count: 8
+# Offense count: 10
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 8
 
-# Offense count: 8
+# Offense count: 10
 Metrics/PerceivedComplexity:
   Max: 16
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/AlignArray:
-  Enabled: false
+# Offense count: 63
+# Cop supports --auto-correct.
+# Configuration parameters: MaxKeyValuePairs.
+Performance/RedundantMerge:
+  Exclude:
+    - 'examples/auth.rb'
+    - 'examples/pylon/pylon_api_v1.2_eg.rb'
+    - 'examples/pylon/pylon_api_v1.3_eg.rb'
+    - 'lib/account.rb'
+    - 'lib/account_identity.rb'
+    - 'lib/account_identity_limit.rb'
+    - 'lib/account_identity_token.rb'
+    - 'lib/cli.rb'
+    - 'lib/datasift.rb'
+    - 'lib/historics_preview.rb'
+    - 'lib/managed_source.rb'
+    - 'lib/push.rb'
+    - 'lib/pylon.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Style/AlignHash:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
 
-# Offense count: 6
+# Offense count: 7
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
 Style/AlignParameters:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
+    - 'test/datasift/core_api_test.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, 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
+# IgnoredMethods: lambda, proc, it
 Style/BlockDelimiters:
-  Enabled: false
+  Exclude:
+    - 'lib/api/api_resource.rb'
+    - 'lib/datasift.rb'
 
-# Offense count: 20
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
 Style/BracesAroundHashParameters:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
+    - 'lib/live_stream.rb'
+    - 'lib/managed_source.rb'
+    - 'lib/push.rb'
 
-# Offense count: 20
+# Offense count: 22
 # Cop supports --auto-correct.
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
+# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep, IndentationWidth.
+# SupportedStyles: case, end
 Style/CaseIndentation:
-  Enabled: false
+  Exclude:
+    - 'examples/account_eg.rb'
+    - 'examples/account_identity_eg.rb'
+    - 'examples/account_identity_limit_eg.rb'
+    - 'examples/account_identity_token_eg.rb'
+    - 'examples/core_api_eg.rb'
+    - 'examples/ingestion/twitter_gnip_batch_eg.rb'
+    - 'examples/live_stream_eg.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/ColonMethodCall:
-  Enabled: false
+  Exclude:
+    - 'examples/live_stream_eg.rb'
 
-# Offense count: 7
+# Offense count: 9
 # Cop supports --auto-correct.
 Style/CommentIndentation:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/DeprecatedHashMethods:
-  Enabled: false
+  Exclude:
+    - 'examples/account_eg.rb'
+    - 'examples/account_identity_eg.rb'
+    - 'examples/account_identity_limit_eg.rb'
+    - 'examples/account_identity_token_eg.rb'
+    - 'examples/core_api_eg.rb'
+    - 'examples/ingestion/twitter_gnip_batch_eg.rb'
+    - 'examples/live_stream_eg.rb'
+    - 'examples/pull.rb'
 
-# Offense count: 14
+# Offense count: 19
 Style/Documentation:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty, nil, both
 Style/EmptyElse:
-  Enabled: false
+  Exclude:
+    - 'examples/account_eg.rb'
+    - 'examples/account_identity_eg.rb'
+    - 'examples/account_identity_limit_eg.rb'
+    - 'examples/account_identity_token_eg.rb'
+    - 'examples/core_api_eg.rb'
+    - 'examples/ingestion/twitter_gnip_batch_eg.rb'
+    - 'examples/live_stream_eg.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLines:
+  Exclude:
+    - 'examples/tmp.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
 Style/EmptyLinesAroundBlockBody:
-  Enabled: false
+  Exclude:
+    - 'test/datasift/core_api_test.rb'
+    - 'test/datasift/push_api_test.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
 Style/EmptyLinesAroundClassBody:
-  Enabled: false
+  Exclude:
+    - 'examples/live_stream_eg.rb'
+    - 'lib/live_stream.rb'
 
-# Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Enabled: false
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Style/ExtraSpacing:
+  Exclude:
+    - 'examples/live_stream_eg.rb'
+    - 'lib/datasift.rb'
 
-# Offense count: 181
+# Offense count: 131
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
 Style/HashSyntax:
-  Enabled: false
+  Exclude:
+    - 'Rakefile'
+    - 'lib/cli.rb'
+    - 'lib/datasift.rb'
+    - 'lib/historics.rb'
+    - 'lib/historics_preview.rb'
+    - 'lib/live_stream.rb'
+    - 'lib/managed_source.rb'
+    - 'lib/push.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
-  Enabled: false
+  Exclude:
+    - 'lib/cli.rb'
+    - 'lib/datasift.rb'
+    - 'lib/live_stream.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
 Style/IndentHash:
-  Enabled: false
+  Exclude:
+    - 'examples/auth.rb'
+    - 'lib/live_stream.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: line_count_dependent, lambda, literal
 Style/Lambda:
-  Enabled: false
+  Exclude:
+    - 'examples/live_stream_eg.rb'
+    - 'examples/pull.rb'
+    - 'lib/live_stream.rb'
 
-# Offense count: 12
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/LeadingCommentSpace:
-  Enabled: false
+  Exclude:
+    - 'examples/core_api_eg.rb'
+    - 'examples/live_stream_eg.rb'
+    - 'examples/pull.rb'
+    - 'examples/tmp.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/MethodCallParentheses:
-  Enabled: false
+  Exclude:
+    - 'examples/pull.rb'
+    - 'examples/push_eg.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
 Style/MethodDefParentheses:
-  Enabled: false
+  Exclude:
+    - 'lib/live_stream.rb'
 
 # Offense count: 2
 Style/MultilineTernaryOperator:
-  Enabled: false
+  Exclude:
+    - 'lib/cli.rb'
 
-# Offense count: 4
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'lib/datasift.rb'
+
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/NegatedIf:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
+    - 'lib/managed_source.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# SupportedStyles: skip_modifier_ifs, always
+Style/Next:
+  Exclude:
+    - 'examples/ingestion/twitter_gnip_batch_eg.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/NilComparison:
-  Enabled: false
+  Exclude:
+    - 'lib/api/api_resource.rb'
+    - 'lib/live_stream.rb'
 
-# Offense count: 7
+# Offense count: 11
 # Cop supports --auto-correct.
 Style/NumericLiterals:
-  MinDigits: 10
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Enabled: false
+  MinDigits: 16
 
 # Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
 Style/PredicateName:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/datasift.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/PreferredHashMethods:
+  Exclude:
+    - 'lib/api/api_resource.rb'
+    - 'lib/live_stream.rb'
 
 # Offense count: 14
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, exploded
 Style/RaiseArgs:
-  Enabled: false
+  Exclude:
+    - 'lib/api/api_resource.rb'
+    - 'lib/datasift.rb'
+    - 'lib/live_stream.rb'
 
-# Offense count: 11
+# Offense count: 13
 # Cop supports --auto-correct.
 Style/RedundantBegin:
-  Enabled: false
+  Exclude:
+    - 'examples/account_eg.rb'
+    - 'examples/account_identity_eg.rb'
+    - 'examples/account_identity_limit_eg.rb'
+    - 'examples/account_identity_token_eg.rb'
+    - 'examples/core_api_eg.rb'
+    - 'examples/historics_eg.rb'
+    - 'examples/historics_preview_eg.rb'
+    - 'examples/ingestion/twitter_gnip_batch_eg.rb'
+    - 'examples/live_stream_eg.rb'
+    - 'examples/pull.rb'
+    - 'examples/push_eg.rb'
+    - 'examples/pylon/pylon_api_v1.2_eg.rb'
+    - 'examples/pylon/pylon_api_v1.3_eg.rb'
 
-# Offense count: 19
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/RescueEnsureAlignment:
+  Exclude:
+    - 'examples/managed_source_ig_eg.rb'
+    - 'examples/pylon/pylon_api_v1.2_eg.rb'
+    - 'examples/pylon/pylon_api_v1.3_eg.rb'
+    - 'examples/tmp.rb'
+
+# Offense count: 44
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: only_raise, only_fail, semantic
 Style/SignalException:
-  Enabled: false
+  Exclude:
+    - 'examples/pull.rb'
+    - 'lib/account_identity.rb'
+    - 'lib/account_identity_limit.rb'
+    - 'lib/account_identity_token.rb'
+    - 'lib/datasift.rb'
+    - 'lib/managed_source.rb'
+    - 'lib/odp.rb'
+    - 'lib/pylon.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/SpaceAfterComma:
-  Enabled: false
+  Exclude:
+    - 'examples/live_stream_eg.rb'
+    - 'examples/pylon/pylon_api_v1.3_eg.rb'
+    - 'lib/cli.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/SpaceAfterMethodName:
-  Enabled: false
+  Exclude:
+    - 'lib/live_stream.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
 Style/SpaceAroundEqualsInParameterDefault:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
 
-# Offense count: 7
+# Offense count: 10
 # Cop supports --auto-correct.
-# Configuration parameters: MultiSpaceAllowedForOperators.
+# Configuration parameters: AllowForAlignment.
 Style/SpaceAroundOperators:
-  Enabled: false
+  Exclude:
+    - 'examples/live_stream_eg.rb'
+    - 'lib/datasift.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
 Style/SpaceBeforeBlockBraces:
-  Enabled: false
+  Exclude:
+    - 'examples/pull.rb'
 
-# Offense count: 15
+# Offense count: 14
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
+# SupportedStyles: space, no_space, compact
 Style/SpaceInsideHashLiteralBraces:
-  Enabled: false
+  Exclude:
+    - 'examples/pull.rb'
+    - 'lib/managed_source.rb'
+    - 'lib/push.rb'
+    - 'lib/pylon.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
 Style/SpaceInsideParens:
-  Enabled: false
+  Exclude:
+    - 'lib/datasift.rb'
 
-# Offense count: 23
+# Offense count: 28
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
-  Enabled: false
+  Exclude:
+    - 'Gemfile'
+    - 'examples/account_eg.rb'
+    - 'examples/account_identity_eg.rb'
+    - 'examples/account_identity_limit_eg.rb'
+    - 'examples/account_identity_token_eg.rb'
+    - 'examples/ingestion/twitter_gnip_batch_eg.rb'
+    - 'examples/pylon/pylon_api_v1.2_eg.rb'
+    - 'examples/pylon/pylon_api_v1.3_eg.rb'
+    - 'examples/tmp.rb'
+    - 'lib/api/api_resource.rb'
+    - 'lib/datasift.rb'
+    - 'test/datasift/core_api_test.rb'
+    - 'test/datasift/odp/batch_upload_test.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/TrailingBlankLines:
-  Enabled: false
-
-# Offense count: 1
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Enabled: false
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+  Exclude:
+    - 'examples/auth.rb'
+    - 'examples/tmp.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
+# Configuration parameters: EnforcedStyle, SupportedStyles, MinSize, WordRegex.
+# SupportedStyles: percent, brackets
 Style/WordArray:
-  MinSize: 4
+  Exclude:
+    - 'lib/cli.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'lib/api/api_resource.rb'
+    - 'lib/cli.rb'
+    - 'lib/datasift.rb'
+    - 'lib/managed_source.rb'
diff --git a/lib/live_stream.rb b/lib/live_stream.rb
index 31c5135..b1dc9ca 100644
--- a/lib/live_stream.rb
+++ b/lib/live_stream.rb
@@ -56,4 +56,4 @@ def unsubscribe hash
       @stream.send "{ \"action\":\"unsubscribe\",\"hash\":\"#{hash}\"}"
     end
   end
-end
\ No newline at end of file
+end