Merge branch 'release/2.1.0.6' into develop

* release/2.1.0.6:
  version bump
Fix optionparser setting
Merge branch 'develop' of github.com:ttscoff/Slogger into develop

* 'develop' of github.com:ttscoff/Slogger:
Adapts to changes with newest Twitter gem
Updating Gemfile to use latest twitter gem
merging in @drallgoods twitter update
version bump
Merge conflict
fix for missing comma