Removing all references of angular from base classes.
Adding Q service to web socket service and fixing up e2e tests