Merge remote-tracking branch 'marek/master'

Conflicts:
	README.md
	elasticsearch_raven/transport.py
	elasticsearch_raven/udp_server.py
	elasticsearch_raven/wsgi.py