Merge pull request #60 from grigio/master

+ AUTHORS
disabling websocket test since its currently broken
more specific line counts
websocket simple test app