Merge branch 'release/2.1.0.11' into develop

* release/2.1.0.11:
  version bump for 2.1.0.11 release
updating levenshtein gem requirement
flickr api seems to request ssl!

changing http to https solves the problem
Merge pull request #310 from gvanbeck/develop

flickr api seems to request ssl!
adding levenshtein to repo
version bump, removing Gemfile.lock from VC
Merge branch 'release/2.1.12'

* release/2.1.12:
  version bump, removing Gemfile.lock from VC
  adding levenshtein to repo
  flickr api seems to request ssl!
  updating levenshtein gem requirement
conflict merge
version bump
Merge branch 'release/2.1.13'

* release/2.1.13:
  version bump
Instapaper fixed the timestamps in their RSS feed

So the hack for dealing with that can be removed
Merge pull request #311 from ArjenSchwarz/master

Instapaper fixed the timestamps in their RSS feed
Gemfile.lock
pull 311
Fixing levenshtein requires
Merge branch 'master' into develop

* master:
  Instapaper fixed the timestamps in their RSS feed
version bump
Merge branch 'release/2.1.14'

* release/2.1.14:
  version bump
  Fixing levenshtein requires
Merge branch 'master' of https://github.com/ttscoff/Slogger
.gitignore is now working