use logstash JSON format for logging in production
updated Gemfile.lock to latest master branch

Conflicts:
	Gemfile.lock
Merge pull request #127 from mfenner/logstash

Use logstash JSON format for logging in production.