Updated to fix issues with attribute names

 * Fixed issue with new attribute name
 * Moved wait_until to its own cookbook as a resource