Merge pull request #22 from alphagov/make-version-number-match-latest-tag

Set version number to 2.0.1, get back in sync with tags
Support extra JSON fields in logstash logs

And upversion to 2.1.0

See https://www.pivotaltracker.com/story/show/70748012

[#70748012]