I left my heart in async await

Last part of #113 

 - [x] found some more superfluous async/await
 - [x] abide by the Toub and use ConfigureAwait where we *need* to use await
 - [x] :lipstick: some code because diff limits

cc @justinvp @paulcbetts