Dist configuration
Merge branch 'master' into dist
Merge branch 'master' into dist
Merge branch 'master' of heroku.com:backbone-sockets