heroku socket config added
heroku not working
Merge branch 'master' of github.com:reyner/mashup
sockets still messed up