Cleanup async

 - Renamed async methods as per the TAP (http://msdn.microsoft.com/en-us/library/hh873175.aspx).
 - Also added a couple missing `.ConfigureAwait(false)`