Websockets#18

gregschmit wants to merge 2 commits intomastergregschmit/rails-rest-framework:masterfrom

gns/websocketsgregschmit/rails-rest-framework:gns/websocketsCopy head branch name to clipboard