Updated changelog.
Removes duplicate entry from Gemfile
Merge pull request #4 from fabrik42/patch-1

Removes duplicate entry from Gemfile
Merge remote-tracking branch 'origin/master' into local_upload