Added async servlet support, servlet 3 annotations, some clean up