More correct puma.rb for listening to sockets
Merge branch 'master' of github.com:cconstantine/wattle

Conflicts:
	config/puma.rb