More tidying and added devise_async and email fixes