Merge branch 'master' of https://github.com/flashmob/go-guerrilla

# Conflicts:
#	README.md
#	backends/gateway.go
#	backends/p_guerrilla_db_redis.go
#	backends/p_redis.go
#	backends/p_redis_test.go
#	backends/storage/redigo/driver.go
#	client.go
#	cmd/guerrillad/serve.go
#	cmd/guerrillad/version.go
#	config.go
#	glide.lock
#	glide.yaml
#	guerrilla.go
#	server.go
#	server_test.go
#	util.go